From 4aae813a7f57fe652857118fe8f325456091e8af Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 18 Sep 2023 10:18:39 +0200
Subject: [PATCH 1/2] Update infra to include tools P2Ps in a tools folder

---
 eng/slngen.targets                     | 4 +++-
 src/libraries/slngen.proj              | 2 +-
 src/tools/Directory.Build.props        | 9 +++++++++
 src/tools/illink/Directory.Build.props | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 src/tools/Directory.Build.props

diff --git a/eng/slngen.targets b/eng/slngen.targets
index 59e2565b3817f..2db8e9c7c3b57 100644
--- a/eng/slngen.targets
+++ b/eng/slngen.targets
@@ -1,8 +1,10 @@
 <Project>
-  <PropertyGroup>
+
+  <PropertyGroup Condition="'$(SlnGenSolutionFolder)' == ''">
     <SlnGenSolutionFolder Condition="'$(IsGeneratorProject)' == 'true'">gen</SlnGenSolutionFolder>
     <SlnGenSolutionFolder Condition="'$(IsReferenceAssemblyProject)' == 'true'">ref</SlnGenSolutionFolder>
     <SlnGenSolutionFolder Condition="'$(IsTestProject)' == 'true' or '$(IsTrimmingTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'">tests</SlnGenSolutionFolder>
     <SlnGenSolutionFolder Condition="'$(SlnGenSolutionFolder)' == ''">src</SlnGenSolutionFolder>
   </PropertyGroup>
+
 </Project>
diff --git a/src/libraries/slngen.proj b/src/libraries/slngen.proj
index 3defd9663be0a..3118a1e1545a3 100644
--- a/src/libraries/slngen.proj
+++ b/src/libraries/slngen.proj
@@ -19,7 +19,7 @@
     <!-- Copy template files, required by slngen -->
     <Copy SourceFiles="$(ProjTemplatePath)"
           DestinationFiles="%(SolutionFile.ProjFilePath)" />
-    
+
     <!-- Invoke slngen -->
     <Exec Command="&quot;$(RepoRoot)dotnet$(ScriptExt)&quot; slngen -p SlnGenMainProject=%(SolutionFile.Filename) --launch false --nologo &quot;%(SolutionFile.ProjFilePath)&quot;" />
 
diff --git a/src/tools/Directory.Build.props b/src/tools/Directory.Build.props
new file mode 100644
index 0000000000000..d654a5047c208
--- /dev/null
+++ b/src/tools/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+
+  <Import Project="..\..\Directory.Build.props" />
+
+  <PropertyGroup>
+    <SlnGenSolutionFolder>tools</SlnGenSolutionFolder>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/tools/illink/Directory.Build.props b/src/tools/illink/Directory.Build.props
index 5f7fa8669cd37..51d947f462d5e 100644
--- a/src/tools/illink/Directory.Build.props
+++ b/src/tools/illink/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
 
-  <Import Project="..\..\..\Directory.Build.props" />
+  <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>

From c9bcaf496d8fc7cd35f208885905207d9363ddd7 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 18 Sep 2023 10:19:05 +0200
Subject: [PATCH 2/2] Update solution files in reaction to illink P2P changes

---
 Directory.Build.targets                       |   1 +
 eng/slngen.targets                            |  10 +-
 src/libraries/Directory.Build.targets         |   1 -
 .../Microsoft.Bcl.AsyncInterfaces.sln         |  53 +-
 .../Microsoft.Bcl.Cryptography.sln            |  53 +-
 .../Microsoft.Bcl.Numerics.sln                |  53 +-
 .../Microsoft.Bcl.TimeProvider.sln            |  53 +-
 .../Microsoft.CSharp/Microsoft.CSharp.sln     |  46 +
 ...rosoft.Extensions.Caching.Abstractions.sln |  53 +-
 .../Microsoft.Extensions.Caching.Memory.sln   |  60 +-
 ....Extensions.Configuration.Abstractions.sln |  53 +-
 ...rosoft.Extensions.Configuration.Binder.sln |  53 ++
 ...t.Extensions.Configuration.CommandLine.sln |  53 +-
 ...ons.Configuration.EnvironmentVariables.sln |  53 +-
 ...xtensions.Configuration.FileExtensions.sln |  53 +-
 ...Microsoft.Extensions.Configuration.Ini.sln |  53 +-
 ...icrosoft.Extensions.Configuration.Json.sln |  46 +
 ...t.Extensions.Configuration.UserSecrets.sln |  46 +
 ...Microsoft.Extensions.Configuration.Xml.sln |  46 +
 .../Microsoft.Extensions.Configuration.sln    |  46 +
 ...sions.DependencyInjection.Abstractions.sln |  53 +-
 ...crosoft.Extensions.DependencyInjection.sln |  60 +-
 .../Microsoft.Extensions.DependencyModel.sln  |  46 +
 ...ft.Extensions.Diagnostics.Abstractions.sln | 165 +++-
 .../Microsoft.Extensions.Diagnostics.sln      | 271 +++---
 ....Extensions.FileProviders.Abstractions.sln |  53 +-
 ...oft.Extensions.FileProviders.Composite.sln |  53 +-
 ...soft.Extensions.FileProviders.Physical.sln |  53 +-
 ...icrosoft.Extensions.FileSystemGlobbing.sln |  53 +-
 ...crosoft.Extensions.HostFactoryResolver.sln |  81 ++
 ...rosoft.Extensions.Hosting.Abstractions.sln | 102 +++
 .../Microsoft.Extensions.Hosting.Systemd.sln  |  81 ++
 ...oft.Extensions.Hosting.WindowsServices.sln |  81 ++
 .../Microsoft.Extensions.Hosting.sln          | 187 ++--
 .../Microsoft.Extensions.Http.sln             | 210 +++--
 ...rosoft.Extensions.Logging.Abstractions.sln |  53 +-
 ...osoft.Extensions.Logging.Configuration.sln |  53 ++
 .../Microsoft.Extensions.Logging.Console.sln  |  53 ++
 .../Microsoft.Extensions.Logging.Debug.sln    |  53 ++
 .../Microsoft.Extensions.Logging.EventLog.sln |  53 ++
 ...crosoft.Extensions.Logging.EventSource.sln |  53 ++
 ...crosoft.Extensions.Logging.TraceSource.sln |  53 ++
 .../Microsoft.Extensions.Logging.sln          |  53 ++
 ...nsions.Options.ConfigurationExtensions.sln |  90 +-
 ...oft.Extensions.Options.DataAnnotations.sln |  60 +-
 .../Microsoft.Extensions.Options.sln          | 167 +++-
 .../Microsoft.Extensions.Primitives.sln       |  53 +-
 .../Microsoft.NETCore.Platforms.sln           |  53 +-
 .../Microsoft.VisualBasic.Core.sln            |  46 +
 .../Microsoft.Win32.Primitives.sln            | 139 ++-
 ...Microsoft.Win32.Registry.AccessControl.sln |  53 +-
 .../Microsoft.Win32.Registry.sln              |  46 +
 .../Microsoft.Win32.SystemEvents.sln          |  53 +-
 .../Microsoft.XmlSerializer.Generator.sln     |  53 +-
 .../System.CodeDom/System.CodeDom.sln         |  53 +-
 .../System.Collections.Concurrent.sln         | 145 ++-
 .../System.Collections.Immutable.sln          |  46 +
 .../System.Collections.NonGeneric.sln         |  46 +
 .../System.Collections.Specialized.sln        |  46 +
 .../System.Collections/System.Collections.sln | 139 ++-
 .../System.ComponentModel.Annotations.sln     |  46 +
 ...omponentModel.Composition.Registration.sln |  53 +-
 .../System.ComponentModel.Composition.sln     |  53 +-
 .../System.ComponentModel.EventBasedAsync.sln |  46 +
 .../System.ComponentModel.Primitives.sln      |  46 +
 .../System.ComponentModel.TypeConverter.sln   |  46 +
 .../System.ComponentModel.sln                 |  46 +
 .../System.Composition.AttributedModel.sln    |  53 +-
 .../System.Composition.Convention.sln         |  53 +-
 .../System.Composition.Hosting.sln            |  53 +-
 .../System.Composition.Runtime.sln            |  53 +-
 .../System.Composition.TypedParts.sln         |  53 +-
 .../System.Composition/System.Composition.sln |  53 +-
 ...tem.Configuration.ConfigurationManager.sln | 597 +++++++++++-
 .../System.Console/System.Console.sln         |  46 +
 .../System.Data.Common/System.Data.Common.sln | 149 ++-
 .../System.Data.Odbc/System.Data.Odbc.sln     |  51 +-
 .../System.Data.OleDb/System.Data.Oledb.sln   | 676 +++++++++++++-
 .../System.Diagnostics.Contracts.sln          | 139 ++-
 .../System.Diagnostics.DiagnosticSource.sln   |  46 +
 .../System.Diagnostics.EventLog.sln           |  53 +-
 .../System.Diagnostics.FileVersionInfo.sln    |  46 +
 .../System.Diagnostics.PerformanceCounter.sln | 633 ++++++++++++-
 .../System.Diagnostics.Process.sln            | 860 ++++++++++++++++++
 .../System.Diagnostics.StackTrace.sln         | 155 +++-
 ...em.Diagnostics.TextWriterTraceListener.sln |  46 +
 .../System.Diagnostics.TraceSource.sln        | 191 +++-
 .../System.Diagnostics.Tracing.sln            | 139 ++-
 ...em.DirectoryServices.AccountManagement.sln | 705 +++++++++++++-
 .../System.DirectoryServices.Protocols.sln    | 544 ++++++++++-
 .../System.DirectoryServices.sln              | 508 ++++++++++-
 .../System.Drawing.Primitives.sln             |  46 +
 .../System.Formats.Asn1.sln                   |  46 +
 .../System.Formats.Cbor.sln                   |  53 +-
 .../System.Formats.Tar/System.Formats.Tar.sln |  62 +-
 .../System.IO.Compression.Brotli.sln          |  46 +
 .../System.IO.Compression.ZipFile.sln         |  46 +
 .../System.IO.Compression.sln                 |  46 +
 .../System.IO.FileSystem.AccessControl.sln    | 617 ++++++++++++-
 .../System.IO.FileSystem.DriveInfo.sln        |  46 +
 .../System.IO.FileSystem.Watcher.sln          |  46 +
 .../System.IO.Hashing/System.IO.Hashing.sln   |  53 +-
 .../System.IO.IsolatedStorage.sln             | 537 ++++++++++-
 .../System.IO.MemoryMappedFiles.sln           |  46 +
 .../System.IO.Packaging.sln                   |  53 +-
 .../System.IO.Pipelines.sln                   |  53 +-
 .../System.IO.Pipes.AccessControl.sln         |  46 +
 .../System.IO.Pipes/System.IO.Pipes.sln       | 765 +++++++++++++++-
 .../System.IO.Ports/System.IO.Ports.sln       |  46 +
 .../System.Linq.Expressions.sln               |  46 +
 .../System.Linq.Parallel.sln                  |  46 +
 .../System.Linq.Queryable.sln                 |  46 +
 src/libraries/System.Linq/System.Linq.sln     |  46 +
 .../System.Management/System.Management.sln   |  53 +-
 .../System.Memory.Data/System.Memory.Data.sln |  46 +
 src/libraries/System.Memory/System.Memory.sln | 139 ++-
 .../System.Net.Http.Json.sln                  |  46 +
 .../System.Net.Http.WinHttpHandler.sln        |  46 +
 .../System.Net.Http/System.Net.Http.sln       |  60 ++
 .../System.Net.HttpListener.sln               |  46 +
 .../System.Net.Mail/System.Net.Mail.sln       |  46 +
 .../System.Net.NameResolution.sln             |  46 +
 .../System.Net.NetworkInformation.sln         |  46 +
 .../System.Net.Ping/System.Net.Ping.sln       |  46 +
 .../System.Net.Primitives.sln                 |  46 +
 .../System.Net.Quic/System.Net.Quic.sln       |  46 +
 .../System.Net.Requests.sln                   |  46 +
 .../System.Net.Security.sln                   |  46 +
 .../System.Net.ServicePoint.sln               |  46 +
 .../System.Net.Sockets/System.Net.Sockets.sln |  46 +
 .../System.Net.WebClient.sln                  |  46 +
 .../System.Net.WebHeaderCollection.sln        |  46 +
 .../System.Net.WebProxy.sln                   |  46 +
 .../System.Net.WebSockets.Client.sln          |  67 ++
 .../System.Net.WebSockets.sln                 |  46 +
 .../System.Numerics.Tensors.sln               |  67 +-
 .../System.Numerics.Vectors.sln               | 139 ++-
 .../System.ObjectModel/System.ObjectModel.sln |  46 +
 ...stem.Private.DataContractSerialization.sln |  60 ++
 .../System.Private.Uri/System.Private.Uri.sln | 139 ++-
 .../System.Private.Xml.Linq.sln               |  46 +
 .../System.Private.Xml/System.Private.Xml.sln |  46 +
 .../System.Reflection.Context.sln             |  53 +-
 .../System.Reflection.DispatchProxy.sln       |  46 +
 .../System.Reflection.Emit.ILGeneration.sln   | 139 ++-
 .../System.Reflection.Emit.Lightweight.sln    | 139 ++-
 .../System.Reflection.Emit.sln                | 153 +++-
 .../System.Reflection.Metadata.sln            |  46 +
 .../System.Reflection.MetadataLoadContext.sln |  46 +
 .../System.Reflection.Primitives.sln          | 139 ++-
 .../System.Reflection.TypeExtensions.sln      | 139 ++-
 .../System.Resources.Extensions.sln           | 474 +++++++++-
 .../System.Resources.Writer.sln               |  46 +
 .../System.Runtime.Caching.sln                | 635 ++++++++++++-
 ...ystem.Runtime.CompilerServices.VisualC.sln |  46 +
 ...tem.Runtime.InteropServices.JavaScript.sln |  46 +
 .../System.Runtime.InteropServices.sln        | 462 ++++++----
 .../System.Runtime.Intrinsics.sln             | 139 ++-
 .../System.Runtime.Loader.sln                 | 187 +++-
 .../System.Runtime.Numerics.sln               |  46 +
 ...ystem.Runtime.Serialization.Formatters.sln | 189 +++-
 .../System.Runtime.Serialization.Json.sln     |  46 +
 ...ystem.Runtime.Serialization.Primitives.sln |  46 +
 .../System.Runtime.Serialization.Schema.sln   |  53 +-
 .../System.Runtime.Serialization.Xml.sln      |  60 +-
 .../System.Runtime/System.Runtime.sln         | 243 +++--
 .../System.Security.AccessControl.sln         |  46 +
 .../System.Security.Claims.sln                |  46 +
 .../System.Security.Cryptography.Cose.sln     |  53 +-
 .../System.Security.Cryptography.Pkcs.sln     |  46 +
 ...em.Security.Cryptography.ProtectedData.sln |  53 +-
 .../System.Security.Cryptography.Xml.sln      |  46 +
 .../System.Security.Cryptography.sln          |  46 +
 .../System.Security.Permissions.sln           | 508 ++++++++++-
 .../System.Security.Principal.Windows.sln     |  46 +
 .../System.ServiceModel.Syndication.sln       |  53 +-
 ...ystem.ServiceProcess.ServiceController.sln |  53 +-
 src/libraries/System.Speech/System.Speech.sln |  53 +-
 .../System.Text.Encoding.CodePages.sln        |  46 +
 .../System.Text.Encoding.Extensions.sln       | 139 ++-
 .../System.Text.Encodings.Web.sln             |  53 +-
 .../System.Text.Json/System.Text.Json.sln     |  46 +
 .../System.Text.RegularExpressions.sln        | 127 ++-
 .../System.Threading.AccessControl.sln        |  53 +-
 .../System.Threading.Channels.sln             |  53 +-
 .../System.Threading.Overlapped.sln           | 139 ++-
 .../System.Threading.RateLimiting.sln         |  53 +-
 .../System.Threading.Tasks.Dataflow.sln       |  53 +-
 .../System.Threading.Tasks.Parallel.sln       |  46 +
 .../System.Threading.Thread.sln               | 139 ++-
 .../System.Threading.ThreadPool.sln           | 154 +++-
 .../System.Threading/System.Threading.sln     | 139 ++-
 .../System.Transactions.Local.sln             |  46 +
 .../System.Web.HttpUtility.sln                |  46 +
 .../System.Windows.Extensions.sln             | 434 ++++++++-
 .../System.Xml.ReaderWriter.sln               |  46 +
 .../System.Xml.XDocument.sln                  |  46 +
 .../System.Xml.XPath.XDocument.sln            |  46 +
 .../System.Xml.XPath/System.Xml.XPath.sln     |  46 +
 .../System.Xml.XmlSerializer.sln              |  46 +
 src/tools/Directory.Build.props               |   2 +-
 201 files changed, 20345 insertions(+), 1231 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 88598f1295f5f..71e6f4f13b32f 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -15,6 +15,7 @@
   <Import Project="$(RepositoryEngineeringDir)generatorProjects.targets" Condition="'$(IsGeneratorProject)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)resolveContract.targets" Condition="'$(IsSourceProject)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)packaging.targets" Condition="'$(IsPackable)' == 'true' and '$(MSBuildProjectExtension)' != '.pkgproj'" />
+  <Import Project="$(RepositoryEngineeringDir)slngen.targets" Condition="'$(IsSlnGen)' == 'true'" />
 
   <!--
   When .NET gets built from source, make the SDK aware there are bootstrap packages
diff --git a/eng/slngen.targets b/eng/slngen.targets
index 2db8e9c7c3b57..551f4fc486cd1 100644
--- a/eng/slngen.targets
+++ b/eng/slngen.targets
@@ -1,10 +1,10 @@
 <Project>
 
-  <PropertyGroup Condition="'$(SlnGenSolutionFolder)' == ''">
-    <SlnGenSolutionFolder Condition="'$(IsGeneratorProject)' == 'true'">gen</SlnGenSolutionFolder>
-    <SlnGenSolutionFolder Condition="'$(IsReferenceAssemblyProject)' == 'true'">ref</SlnGenSolutionFolder>
-    <SlnGenSolutionFolder Condition="'$(IsTestProject)' == 'true' or '$(IsTrimmingTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'">tests</SlnGenSolutionFolder>
-    <SlnGenSolutionFolder Condition="'$(SlnGenSolutionFolder)' == ''">src</SlnGenSolutionFolder>
+  <PropertyGroup>
+    <SlnGenSolutionFolder Condition="'$(IsGeneratorProject)' == 'true'">$(SlnGenSolutionFolder)gen</SlnGenSolutionFolder>
+    <SlnGenSolutionFolder Condition="'$(IsReferenceAssemblyProject)' == 'true'">$(SlnGenSolutionFolder)ref</SlnGenSolutionFolder>
+    <SlnGenSolutionFolder Condition="'$(IsTestProject)' == 'true' or '$(IsTrimmingTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'">$(SlnGenSolutionFolder)tests</SlnGenSolutionFolder>
+    <SlnGenSolutionFolder Condition="'$(IsSourceProject)' == 'true' or '$(SlnGenSolutionFolder)' == ''">$(SlnGenSolutionFolder)src</SlnGenSolutionFolder>
   </PropertyGroup>
 
 </Project>
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index acd5edc193262..e8b11793d5ef6 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -125,7 +125,6 @@
   <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" Condition="'$(IsSlnGen)' == 'true'" />
 
   <Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(IsSourceProject)' == 'true' or '$(ExplicitlyImportCustomILLinkTargets)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)AvoidRestoreCycleOnSelfReference.targets" Condition="'$(AvoidRestoreCycleOnSelfReference)' == 'true'" />
diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln b/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln
index 65b512f07a18d..54d14ae5c2cf6 100644
--- a/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln
+++ b/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln
@@ -7,12 +7,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfac
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces.Tests", "tests\Microsoft.Bcl.AsyncInterfaces.Tests.csproj", "{51D9518A-464D-4257-9567-3BDCFF24F3EE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{E30F71EB-6C3B-4052-84F7-36EAA178A45E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{0AE44453-273B-4F0E-9901-A87891A73C1B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{59CE8DDB-AFFD-4C6F-B09F-94DE4DD0AAEA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{0225750F-4DC0-4C71-9B33-314ACA0EF682}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{272C69D8-6BED-4CE0-BD62-9F993989374E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{FCA0C2EA-4A82-4B3F-A9B5-E0B5200866BF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{9957B23B-3C95-4200-A6D9-F05BAF6DC7A7}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{111B1B5B-A004-4C05-9A8C-E0931DADA5FB}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{85204CF5-0C8
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D6A9108E-553B-445E-A037-FA4F3140A279}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{F4939A3B-3316-4166-8AE6-34E1D0863CF5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{1AC9674D-927D-49C4-BB42-6FF353C84275}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{670FB605-56DB-45F0-9B48-F8A62AFE5BD9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{8F627B90-170F-4BCE-A626-7688EC714FB4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{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
-		{E30F71EB-6C3B-4052-84F7-36EAA178A45E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E30F71EB-6C3B-4052-84F7-36EAA178A45E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E30F71EB-6C3B-4052-84F7-36EAA178A45E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E30F71EB-6C3B-4052-84F7-36EAA178A45E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0AE44453-273B-4F0E-9901-A87891A73C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0AE44453-273B-4F0E-9901-A87891A73C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0AE44453-273B-4F0E-9901-A87891A73C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59CE8DDB-AFFD-4C6F-B09F-94DE4DD0AAEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59CE8DDB-AFFD-4C6F-B09F-94DE4DD0AAEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59CE8DDB-AFFD-4C6F-B09F-94DE4DD0AAEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59CE8DDB-AFFD-4C6F-B09F-94DE4DD0AAEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0225750F-4DC0-4C71-9B33-314ACA0EF682}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0225750F-4DC0-4C71-9B33-314ACA0EF682}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0225750F-4DC0-4C71-9B33-314ACA0EF682}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0225750F-4DC0-4C71-9B33-314ACA0EF682}.Release|Any CPU.Build.0 = Release|Any CPU
+		{272C69D8-6BED-4CE0-BD62-9F993989374E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{272C69D8-6BED-4CE0-BD62-9F993989374E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{272C69D8-6BED-4CE0-BD62-9F993989374E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{272C69D8-6BED-4CE0-BD62-9F993989374E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FCA0C2EA-4A82-4B3F-A9B5-E0B5200866BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FCA0C2EA-4A82-4B3F-A9B5-E0B5200866BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FCA0C2EA-4A82-4B3F-A9B5-E0B5200866BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FCA0C2EA-4A82-4B3F-A9B5-E0B5200866BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9957B23B-3C95-4200-A6D9-F05BAF6DC7A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9957B23B-3C95-4200-A6D9-F05BAF6DC7A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9957B23B-3C95-4200-A6D9-F05BAF6DC7A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9957B23B-3C95-4200-A6D9-F05BAF6DC7A7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,9 +96,16 @@ Global
 		{51D9518A-464D-4257-9567-3BDCFF24F3EE} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}
 		{73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB}
 		{4D4BED71-8904-4A74-88CD-63D002CCACD0} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}
-		{E30F71EB-6C3B-4052-84F7-36EAA178A45E} = {D6A9108E-553B-445E-A037-FA4F3140A279}
 		{0AE44453-273B-4F0E-9901-A87891A73C1B} = {D6A9108E-553B-445E-A037-FA4F3140A279}
 		{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB} = {D6A9108E-553B-445E-A037-FA4F3140A279}
+		{59CE8DDB-AFFD-4C6F-B09F-94DE4DD0AAEA} = {F4939A3B-3316-4166-8AE6-34E1D0863CF5}
+		{0225750F-4DC0-4C71-9B33-314ACA0EF682} = {F4939A3B-3316-4166-8AE6-34E1D0863CF5}
+		{F4939A3B-3316-4166-8AE6-34E1D0863CF5} = {8F627B90-170F-4BCE-A626-7688EC714FB4}
+		{272C69D8-6BED-4CE0-BD62-9F993989374E} = {1AC9674D-927D-49C4-BB42-6FF353C84275}
+		{FCA0C2EA-4A82-4B3F-A9B5-E0B5200866BF} = {1AC9674D-927D-49C4-BB42-6FF353C84275}
+		{1AC9674D-927D-49C4-BB42-6FF353C84275} = {8F627B90-170F-4BCE-A626-7688EC714FB4}
+		{9957B23B-3C95-4200-A6D9-F05BAF6DC7A7} = {670FB605-56DB-45F0-9B48-F8A62AFE5BD9}
+		{670FB605-56DB-45F0-9B48-F8A62AFE5BD9} = {8F627B90-170F-4BCE-A626-7688EC714FB4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A835CEDB-E9E2-49EE-8499-BD7FDD984E53}
diff --git a/src/libraries/Microsoft.Bcl.Cryptography/Microsoft.Bcl.Cryptography.sln b/src/libraries/Microsoft.Bcl.Cryptography/Microsoft.Bcl.Cryptography.sln
index e64d650ad586f..7b4972e18f9fc 100644
--- a/src/libraries/Microsoft.Bcl.Cryptography/Microsoft.Bcl.Cryptography.sln
+++ b/src/libraries/Microsoft.Bcl.Cryptography/Microsoft.Bcl.Cryptography.sln
@@ -7,12 +7,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography.Tests", "tests\Microsoft.Bcl.Cryptography.Tests.csproj", "{E66D17AB-BBAF-4F2B-AC9C-8E89BDCC6191}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{B61AD28A-1FB4-478D-B75D-77852F65BBA4}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{E9271403-BEF5-46E9-B68B-16EF69AA7149}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{A4C2BDDC-1AFB-45A8-9E9B-4AD7396A4DF2}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{777AF5DE-3EB3-4E62-A0D8-CA10D77B5343}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{94384409-052F-4697-B235-8990C851B6A4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{A243E975-A17E-4DA8-91AC-7FCB52EAB921}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{7C971319-753D-4D49-B242-994260ABD9AF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{E4477F0C-A13A-4C1A-9A70-0A287E09E9EA}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8C3BD4AD-1A56-4204-9826-F8B74251D19F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7E9F6DE1-771B-4E25-A603-EC43D0291C8B}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{98708A22-726
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{34897637-11A1-48A4-AF1F-E11463A61D0B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{568C437D-072B-48BA-BBB4-20F39E2ADA15}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{AEDD1BBB-88D7-4CC1-9262-D94341DAD308}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{3AFC9F72-C997-4066-86FD-EDA22F432C73}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{98BFC458-097E-4C6C-BAE8-03199531D531}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{E66D17AB-BBAF-4F2B-AC9C-8E89BDCC6191}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E66D17AB-BBAF-4F2B-AC9C-8E89BDCC6191}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E66D17AB-BBAF-4F2B-AC9C-8E89BDCC6191}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B61AD28A-1FB4-478D-B75D-77852F65BBA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B61AD28A-1FB4-478D-B75D-77852F65BBA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B61AD28A-1FB4-478D-B75D-77852F65BBA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B61AD28A-1FB4-478D-B75D-77852F65BBA4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E9271403-BEF5-46E9-B68B-16EF69AA7149}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E9271403-BEF5-46E9-B68B-16EF69AA7149}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E9271403-BEF5-46E9-B68B-16EF69AA7149}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{A4C2BDDC-1AFB-45A8-9E9B-4AD7396A4DF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A4C2BDDC-1AFB-45A8-9E9B-4AD7396A4DF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4C2BDDC-1AFB-45A8-9E9B-4AD7396A4DF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{777AF5DE-3EB3-4E62-A0D8-CA10D77B5343}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{777AF5DE-3EB3-4E62-A0D8-CA10D77B5343}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{777AF5DE-3EB3-4E62-A0D8-CA10D77B5343}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{777AF5DE-3EB3-4E62-A0D8-CA10D77B5343}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94384409-052F-4697-B235-8990C851B6A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94384409-052F-4697-B235-8990C851B6A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94384409-052F-4697-B235-8990C851B6A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94384409-052F-4697-B235-8990C851B6A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A243E975-A17E-4DA8-91AC-7FCB52EAB921}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A243E975-A17E-4DA8-91AC-7FCB52EAB921}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A243E975-A17E-4DA8-91AC-7FCB52EAB921}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A243E975-A17E-4DA8-91AC-7FCB52EAB921}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C971319-753D-4D49-B242-994260ABD9AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C971319-753D-4D49-B242-994260ABD9AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C971319-753D-4D49-B242-994260ABD9AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C971319-753D-4D49-B242-994260ABD9AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E4477F0C-A13A-4C1A-9A70-0A287E09E9EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4477F0C-A13A-4C1A-9A70-0A287E09E9EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4477F0C-A13A-4C1A-9A70-0A287E09E9EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E4477F0C-A13A-4C1A-9A70-0A287E09E9EA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,9 +96,16 @@ Global
 		{E66D17AB-BBAF-4F2B-AC9C-8E89BDCC6191} = {8C3BD4AD-1A56-4204-9826-F8B74251D19F}
 		{63655B2E-6A06-4E48-9F01-D0B910063165} = {7E9F6DE1-771B-4E25-A603-EC43D0291C8B}
 		{B0716D7E-B824-4866-A1ED-DF31BA2970B9} = {98708A22-7268-4EDB-AE37-70AA958A772A}
-		{B61AD28A-1FB4-478D-B75D-77852F65BBA4} = {34897637-11A1-48A4-AF1F-E11463A61D0B}
 		{E9271403-BEF5-46E9-B68B-16EF69AA7149} = {34897637-11A1-48A4-AF1F-E11463A61D0B}
 		{A4C2BDDC-1AFB-45A8-9E9B-4AD7396A4DF2} = {34897637-11A1-48A4-AF1F-E11463A61D0B}
+		{777AF5DE-3EB3-4E62-A0D8-CA10D77B5343} = {568C437D-072B-48BA-BBB4-20F39E2ADA15}
+		{94384409-052F-4697-B235-8990C851B6A4} = {568C437D-072B-48BA-BBB4-20F39E2ADA15}
+		{568C437D-072B-48BA-BBB4-20F39E2ADA15} = {98BFC458-097E-4C6C-BAE8-03199531D531}
+		{A243E975-A17E-4DA8-91AC-7FCB52EAB921} = {AEDD1BBB-88D7-4CC1-9262-D94341DAD308}
+		{7C971319-753D-4D49-B242-994260ABD9AF} = {AEDD1BBB-88D7-4CC1-9262-D94341DAD308}
+		{AEDD1BBB-88D7-4CC1-9262-D94341DAD308} = {98BFC458-097E-4C6C-BAE8-03199531D531}
+		{E4477F0C-A13A-4C1A-9A70-0A287E09E9EA} = {3AFC9F72-C997-4066-86FD-EDA22F432C73}
+		{3AFC9F72-C997-4066-86FD-EDA22F432C73} = {98BFC458-097E-4C6C-BAE8-03199531D531}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EAA35B12-9858-4428-8510-F09B19933FB9}
diff --git a/src/libraries/Microsoft.Bcl.Numerics/Microsoft.Bcl.Numerics.sln b/src/libraries/Microsoft.Bcl.Numerics/Microsoft.Bcl.Numerics.sln
index 1192785b14a9f..2490a78a68c41 100644
--- a/src/libraries/Microsoft.Bcl.Numerics/Microsoft.Bcl.Numerics.sln
+++ b/src/libraries/Microsoft.Bcl.Numerics/Microsoft.Bcl.Numerics.sln
@@ -7,12 +7,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Numerics", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Numerics.Tests", "tests\Microsoft.Bcl.Numerics.Tests.csproj", "{51D9518A-464D-4257-9567-3BDCFF24F3EE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{E30F71EB-6C3B-4052-84F7-36EAA178A45E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{0AE44453-273B-4F0E-9901-A87891A73C1B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{21224EF3-8706-4C95-8009-ADCA451B1513}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{5455F8B5-6A95-42AE-9D6E-AA13D0324D9A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{53C6C9CF-FF18-46A0-984F-F56B5963D3F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{DBBC7B68-FB1F-438F-B0D8-EDA8000A7D8D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{8FA7D6DC-A098-4991-96B1-5A6AA6064A0C}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{111B1B5B-A004-4C05-9A8C-E0931DADA5FB}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{85204CF5-0C8
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D6A9108E-553B-445E-A037-FA4F3140A279}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0B6D6DEB-1D82-4C19-98F5-7CCDB5AEBACA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{9EC77498-07C2-4E35-BB08-98A192D72A58}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C62FCD0A-8212-4342-AE80-7E7E648A713C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{84DB9E5E-D290-46B3-ABB5-7E53CBDEBEC3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{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
-		{E30F71EB-6C3B-4052-84F7-36EAA178A45E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E30F71EB-6C3B-4052-84F7-36EAA178A45E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E30F71EB-6C3B-4052-84F7-36EAA178A45E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E30F71EB-6C3B-4052-84F7-36EAA178A45E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0AE44453-273B-4F0E-9901-A87891A73C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0AE44453-273B-4F0E-9901-A87891A73C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0AE44453-273B-4F0E-9901-A87891A73C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21224EF3-8706-4C95-8009-ADCA451B1513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21224EF3-8706-4C95-8009-ADCA451B1513}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21224EF3-8706-4C95-8009-ADCA451B1513}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21224EF3-8706-4C95-8009-ADCA451B1513}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5455F8B5-6A95-42AE-9D6E-AA13D0324D9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5455F8B5-6A95-42AE-9D6E-AA13D0324D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5455F8B5-6A95-42AE-9D6E-AA13D0324D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5455F8B5-6A95-42AE-9D6E-AA13D0324D9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53C6C9CF-FF18-46A0-984F-F56B5963D3F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53C6C9CF-FF18-46A0-984F-F56B5963D3F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53C6C9CF-FF18-46A0-984F-F56B5963D3F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53C6C9CF-FF18-46A0-984F-F56B5963D3F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DBBC7B68-FB1F-438F-B0D8-EDA8000A7D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBBC7B68-FB1F-438F-B0D8-EDA8000A7D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBBC7B68-FB1F-438F-B0D8-EDA8000A7D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBBC7B68-FB1F-438F-B0D8-EDA8000A7D8D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FA7D6DC-A098-4991-96B1-5A6AA6064A0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FA7D6DC-A098-4991-96B1-5A6AA6064A0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FA7D6DC-A098-4991-96B1-5A6AA6064A0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FA7D6DC-A098-4991-96B1-5A6AA6064A0C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,9 +96,16 @@ Global
 		{51D9518A-464D-4257-9567-3BDCFF24F3EE} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}
 		{73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB}
 		{4D4BED71-8904-4A74-88CD-63D002CCACD0} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}
-		{E30F71EB-6C3B-4052-84F7-36EAA178A45E} = {D6A9108E-553B-445E-A037-FA4F3140A279}
 		{0AE44453-273B-4F0E-9901-A87891A73C1B} = {D6A9108E-553B-445E-A037-FA4F3140A279}
 		{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB} = {D6A9108E-553B-445E-A037-FA4F3140A279}
+		{21224EF3-8706-4C95-8009-ADCA451B1513} = {0B6D6DEB-1D82-4C19-98F5-7CCDB5AEBACA}
+		{5455F8B5-6A95-42AE-9D6E-AA13D0324D9A} = {0B6D6DEB-1D82-4C19-98F5-7CCDB5AEBACA}
+		{0B6D6DEB-1D82-4C19-98F5-7CCDB5AEBACA} = {84DB9E5E-D290-46B3-ABB5-7E53CBDEBEC3}
+		{53C6C9CF-FF18-46A0-984F-F56B5963D3F1} = {9EC77498-07C2-4E35-BB08-98A192D72A58}
+		{DBBC7B68-FB1F-438F-B0D8-EDA8000A7D8D} = {9EC77498-07C2-4E35-BB08-98A192D72A58}
+		{9EC77498-07C2-4E35-BB08-98A192D72A58} = {84DB9E5E-D290-46B3-ABB5-7E53CBDEBEC3}
+		{8FA7D6DC-A098-4991-96B1-5A6AA6064A0C} = {C62FCD0A-8212-4342-AE80-7E7E648A713C}
+		{C62FCD0A-8212-4342-AE80-7E7E648A713C} = {84DB9E5E-D290-46B3-ABB5-7E53CBDEBEC3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A835CEDB-E9E2-49EE-8499-BD7FDD984E53}
diff --git a/src/libraries/Microsoft.Bcl.TimeProvider/Microsoft.Bcl.TimeProvider.sln b/src/libraries/Microsoft.Bcl.TimeProvider/Microsoft.Bcl.TimeProvider.sln
index 2528c6b87142f..7ef408541c64a 100644
--- a/src/libraries/Microsoft.Bcl.TimeProvider/Microsoft.Bcl.TimeProvider.sln
+++ b/src/libraries/Microsoft.Bcl.TimeProvider/Microsoft.Bcl.TimeProvider.sln
@@ -7,12 +7,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.TimeProvider"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.TimeProvider.Tests", "tests\Microsoft.Bcl.TimeProvider.Tests.csproj", "{8DBA87BA-C9C5-48AF-9D34-4B9877B28F9E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{A8FF8B4E-A39C-4CBC-82C4-AC6C051D4386}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4FB1DB0F-1371-4635-8160-6AB3B3D3BB04}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{6D351E62-CB41-4E2A-B7E7-55FAC33C6B16}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{E993DE92-F571-45CF-A879-87ADA3CCEF7E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{5E7E6A50-109D-45DA-A70C-B00AB5BCF964}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{F2D0E933-5501-4516-A2D8-DBD723B87A96}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{DD361556-5404-40DF-B2F3-6557A0207C89}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{D851DE65-D4F7-46B2-82B1-098DF24E2A07}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B7AA510C-BBAF-4D08-A81C-56A134460112}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{88C727A1-C9E9-4381-AC3A-5213CAE17602}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C2DE61FC-AB3
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2DA8DE52-952C-4E9B-8C4D-5FF6AC27CA62}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{F0432FE3-6BCD-4B1C-BF81-2CDEDA0B8F50}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{2AFD2061-9ECF-4C29-A140-D799EF345CAE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{B30FFA4F-3D3E-424C-94A5-0A9F10E6ABB6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{33861368-2ED3-4E31-BF8A-A3F53CD17330}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{8DBA87BA-C9C5-48AF-9D34-4B9877B28F9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8DBA87BA-C9C5-48AF-9D34-4B9877B28F9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8DBA87BA-C9C5-48AF-9D34-4B9877B28F9E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A8FF8B4E-A39C-4CBC-82C4-AC6C051D4386}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8FF8B4E-A39C-4CBC-82C4-AC6C051D4386}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8FF8B4E-A39C-4CBC-82C4-AC6C051D4386}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A8FF8B4E-A39C-4CBC-82C4-AC6C051D4386}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4FB1DB0F-1371-4635-8160-6AB3B3D3BB04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4FB1DB0F-1371-4635-8160-6AB3B3D3BB04}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FB1DB0F-1371-4635-8160-6AB3B3D3BB04}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{6D351E62-CB41-4E2A-B7E7-55FAC33C6B16}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D351E62-CB41-4E2A-B7E7-55FAC33C6B16}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6D351E62-CB41-4E2A-B7E7-55FAC33C6B16}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E993DE92-F571-45CF-A879-87ADA3CCEF7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E993DE92-F571-45CF-A879-87ADA3CCEF7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E993DE92-F571-45CF-A879-87ADA3CCEF7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E993DE92-F571-45CF-A879-87ADA3CCEF7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E7E6A50-109D-45DA-A70C-B00AB5BCF964}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E7E6A50-109D-45DA-A70C-B00AB5BCF964}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E7E6A50-109D-45DA-A70C-B00AB5BCF964}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E7E6A50-109D-45DA-A70C-B00AB5BCF964}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F2D0E933-5501-4516-A2D8-DBD723B87A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2D0E933-5501-4516-A2D8-DBD723B87A96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2D0E933-5501-4516-A2D8-DBD723B87A96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2D0E933-5501-4516-A2D8-DBD723B87A96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD361556-5404-40DF-B2F3-6557A0207C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD361556-5404-40DF-B2F3-6557A0207C89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD361556-5404-40DF-B2F3-6557A0207C89}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD361556-5404-40DF-B2F3-6557A0207C89}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D851DE65-D4F7-46B2-82B1-098DF24E2A07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D851DE65-D4F7-46B2-82B1-098DF24E2A07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D851DE65-D4F7-46B2-82B1-098DF24E2A07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D851DE65-D4F7-46B2-82B1-098DF24E2A07}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,9 +96,16 @@ Global
 		{8DBA87BA-C9C5-48AF-9D34-4B9877B28F9E} = {B7AA510C-BBAF-4D08-A81C-56A134460112}
 		{A4806044-E9CE-4744-86A3-7B0968466474} = {88C727A1-C9E9-4381-AC3A-5213CAE17602}
 		{6BF3C14F-036A-4A04-90EC-82ADC2900805} = {C2DE61FC-AB38-4E50-8892-1363AFFCEC63}
-		{A8FF8B4E-A39C-4CBC-82C4-AC6C051D4386} = {2DA8DE52-952C-4E9B-8C4D-5FF6AC27CA62}
 		{4FB1DB0F-1371-4635-8160-6AB3B3D3BB04} = {2DA8DE52-952C-4E9B-8C4D-5FF6AC27CA62}
 		{6D351E62-CB41-4E2A-B7E7-55FAC33C6B16} = {2DA8DE52-952C-4E9B-8C4D-5FF6AC27CA62}
+		{E993DE92-F571-45CF-A879-87ADA3CCEF7E} = {F0432FE3-6BCD-4B1C-BF81-2CDEDA0B8F50}
+		{5E7E6A50-109D-45DA-A70C-B00AB5BCF964} = {F0432FE3-6BCD-4B1C-BF81-2CDEDA0B8F50}
+		{F0432FE3-6BCD-4B1C-BF81-2CDEDA0B8F50} = {33861368-2ED3-4E31-BF8A-A3F53CD17330}
+		{F2D0E933-5501-4516-A2D8-DBD723B87A96} = {2AFD2061-9ECF-4C29-A140-D799EF345CAE}
+		{DD361556-5404-40DF-B2F3-6557A0207C89} = {2AFD2061-9ECF-4C29-A140-D799EF345CAE}
+		{2AFD2061-9ECF-4C29-A140-D799EF345CAE} = {33861368-2ED3-4E31-BF8A-A3F53CD17330}
+		{D851DE65-D4F7-46B2-82B1-098DF24E2A07} = {B30FFA4F-3D3E-424C-94A5-0A9F10E6ABB6}
+		{B30FFA4F-3D3E-424C-94A5-0A9F10E6ABB6} = {33861368-2ED3-4E31-BF8A-A3F53CD17330}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B3004FFF-3524-4627-A3E5-BBEEBE4BF1AC}
diff --git a/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln b/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln
index d3459462257ee..7207dd4e74f6f 100644
--- a/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln
+++ b/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln
@@ -21,6 +21,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{C89FC14C-795C-469E-A053-A2844C0B7AA8}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{780BF284-2765-4B96-A817-CE9AEB1BC979}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{84957D3F-C9E3-4191-8BD1-D0492F5D0B69}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{465840D4-5267-4DC2-A675-A32BE9584745}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{DB79B0FC-557E-4FCE-871B-F53F790DBD60}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{54EA706E-28CA-4CCF-82CC-6B211E683C2E}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E6224881-0E5B-4FDC-99C4-DDE6E59F806B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{85A4D137-FEEC-4F3C-9358-F2BFFFF6D2DE}"
@@ -29,6 +39,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E4FC7A8F-502
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{9C11B257-64B7-4EC9-BF3E-4859FB66281D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D293C8E5-5C86-4096-9F9D-0129396A1AD7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{ABC2DBF6-FE78-44B1-86B8-D759660B5462}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{8C230199-AEBC-4299-A612-5025FC987A41}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{1725BEE8-1704-4D2D-BD98-CFEC326A5DEA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,6 +97,26 @@ Global
 		{C89FC14C-795C-469E-A053-A2844C0B7AA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C89FC14C-795C-469E-A053-A2844C0B7AA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C89FC14C-795C-469E-A053-A2844C0B7AA8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{780BF284-2765-4B96-A817-CE9AEB1BC979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{780BF284-2765-4B96-A817-CE9AEB1BC979}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{780BF284-2765-4B96-A817-CE9AEB1BC979}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{780BF284-2765-4B96-A817-CE9AEB1BC979}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84957D3F-C9E3-4191-8BD1-D0492F5D0B69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84957D3F-C9E3-4191-8BD1-D0492F5D0B69}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84957D3F-C9E3-4191-8BD1-D0492F5D0B69}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84957D3F-C9E3-4191-8BD1-D0492F5D0B69}.Release|Any CPU.Build.0 = Release|Any CPU
+		{465840D4-5267-4DC2-A675-A32BE9584745}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{465840D4-5267-4DC2-A675-A32BE9584745}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{465840D4-5267-4DC2-A675-A32BE9584745}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{465840D4-5267-4DC2-A675-A32BE9584745}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB79B0FC-557E-4FCE-871B-F53F790DBD60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB79B0FC-557E-4FCE-871B-F53F790DBD60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB79B0FC-557E-4FCE-871B-F53F790DBD60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB79B0FC-557E-4FCE-871B-F53F790DBD60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54EA706E-28CA-4CCF-82CC-6B211E683C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54EA706E-28CA-4CCF-82CC-6B211E683C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54EA706E-28CA-4CCF-82CC-6B211E683C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54EA706E-28CA-4CCF-82CC-6B211E683C2E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -95,6 +133,14 @@ Global
 		{BB30502C-6FBE-467E-AE6B-380EC60BD666} = {9C11B257-64B7-4EC9-BF3E-4859FB66281D}
 		{B78B9BD0-6D82-400A-A373-C42051D9C3D8} = {9C11B257-64B7-4EC9-BF3E-4859FB66281D}
 		{7223E4B2-40ED-48FB-9BFA-07002AD674DB} = {9C11B257-64B7-4EC9-BF3E-4859FB66281D}
+		{780BF284-2765-4B96-A817-CE9AEB1BC979} = {D293C8E5-5C86-4096-9F9D-0129396A1AD7}
+		{84957D3F-C9E3-4191-8BD1-D0492F5D0B69} = {D293C8E5-5C86-4096-9F9D-0129396A1AD7}
+		{D293C8E5-5C86-4096-9F9D-0129396A1AD7} = {1725BEE8-1704-4D2D-BD98-CFEC326A5DEA}
+		{465840D4-5267-4DC2-A675-A32BE9584745} = {ABC2DBF6-FE78-44B1-86B8-D759660B5462}
+		{DB79B0FC-557E-4FCE-871B-F53F790DBD60} = {ABC2DBF6-FE78-44B1-86B8-D759660B5462}
+		{ABC2DBF6-FE78-44B1-86B8-D759660B5462} = {1725BEE8-1704-4D2D-BD98-CFEC326A5DEA}
+		{54EA706E-28CA-4CCF-82CC-6B211E683C2E} = {8C230199-AEBC-4299-A612-5025FC987A41}
+		{8C230199-AEBC-4299-A612-5025FC987A41} = {1725BEE8-1704-4D2D-BD98-CFEC326A5DEA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A1ECF510-F5DB-4E7F-853E-DD3C0CE04C12}
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 795aa1a253654..adf3c27de3b84 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
@@ -7,18 +7,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{9556B0C4-098C-45E3-A7EB-1A219B7F941C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{AADD31E2-3BD3-44F9-811C-4F6AD28EA7E5}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{E1D67575-BF5F-43EB-A81E-6043A427FBEF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{22B98A76-A2BE-47ED-82F2-9BD0EF50B22D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{62920990-3992-4020-BE2A-82061DD47813}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{4094B781-6FCF-4ED4-ABD5-D273FCB81909}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{BA707680-8926-4BA5-8F8E-1FAA55908831}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{4F2ACC77-7868-425C-B9A1-C6A68488EA47}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{F6FDA9BD-309C-4271-90DF-DADB15482EBD}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4B23C940-1856-48C0-94F2-66D4ADC41EA4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F5D1F8C5-8A12-4EE8-9ABA-D393EBBCB1AA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CF895AB4-6805-4E7D-B8B3-7D363C7D6027}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CE894530-F3D6-4868-B0B1-5FF935ACE502}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{BE5C90DD-DCAE-4934-96B7-59DFD8746EE5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{50277FC9-3A7E-4EAE-8BF7-5CC23005D042}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{649B9C54-4FF3-4EEB-8FF8-F50CCD3F8EFB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +57,6 @@ Global
 		{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
-		{AADD31E2-3BD3-44F9-811C-4F6AD28EA7E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AADD31E2-3BD3-44F9-811C-4F6AD28EA7E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AADD31E2-3BD3-44F9-811C-4F6AD28EA7E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AADD31E2-3BD3-44F9-811C-4F6AD28EA7E5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E1D67575-BF5F-43EB-A81E-6043A427FBEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1D67575-BF5F-43EB-A81E-6043A427FBEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E1D67575-BF5F-43EB-A81E-6043A427FBEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -53,6 +65,26 @@ Global
 		{22B98A76-A2BE-47ED-82F2-9BD0EF50B22D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{22B98A76-A2BE-47ED-82F2-9BD0EF50B22D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{22B98A76-A2BE-47ED-82F2-9BD0EF50B22D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62920990-3992-4020-BE2A-82061DD47813}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62920990-3992-4020-BE2A-82061DD47813}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62920990-3992-4020-BE2A-82061DD47813}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62920990-3992-4020-BE2A-82061DD47813}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4094B781-6FCF-4ED4-ABD5-D273FCB81909}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4094B781-6FCF-4ED4-ABD5-D273FCB81909}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4094B781-6FCF-4ED4-ABD5-D273FCB81909}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4094B781-6FCF-4ED4-ABD5-D273FCB81909}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA707680-8926-4BA5-8F8E-1FAA55908831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA707680-8926-4BA5-8F8E-1FAA55908831}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA707680-8926-4BA5-8F8E-1FAA55908831}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA707680-8926-4BA5-8F8E-1FAA55908831}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F2ACC77-7868-425C-B9A1-C6A68488EA47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F2ACC77-7868-425C-B9A1-C6A68488EA47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F2ACC77-7868-425C-B9A1-C6A68488EA47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F2ACC77-7868-425C-B9A1-C6A68488EA47}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6FDA9BD-309C-4271-90DF-DADB15482EBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6FDA9BD-309C-4271-90DF-DADB15482EBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6FDA9BD-309C-4271-90DF-DADB15482EBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6FDA9BD-309C-4271-90DF-DADB15482EBD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -62,9 +94,16 @@ Global
 		{3CE7A561-5A2F-4AF3-8CC2-8148BC5CCE90} = {4B23C940-1856-48C0-94F2-66D4ADC41EA4}
 		{5904EB23-3221-4992-A1F9-70F8B5478DF2} = {F5D1F8C5-8A12-4EE8-9ABA-D393EBBCB1AA}
 		{9556B0C4-098C-45E3-A7EB-1A219B7F941C} = {F5D1F8C5-8A12-4EE8-9ABA-D393EBBCB1AA}
-		{AADD31E2-3BD3-44F9-811C-4F6AD28EA7E5} = {CF895AB4-6805-4E7D-B8B3-7D363C7D6027}
 		{E1D67575-BF5F-43EB-A81E-6043A427FBEF} = {CF895AB4-6805-4E7D-B8B3-7D363C7D6027}
 		{22B98A76-A2BE-47ED-82F2-9BD0EF50B22D} = {CF895AB4-6805-4E7D-B8B3-7D363C7D6027}
+		{62920990-3992-4020-BE2A-82061DD47813} = {CE894530-F3D6-4868-B0B1-5FF935ACE502}
+		{4094B781-6FCF-4ED4-ABD5-D273FCB81909} = {CE894530-F3D6-4868-B0B1-5FF935ACE502}
+		{CE894530-F3D6-4868-B0B1-5FF935ACE502} = {649B9C54-4FF3-4EEB-8FF8-F50CCD3F8EFB}
+		{BA707680-8926-4BA5-8F8E-1FAA55908831} = {BE5C90DD-DCAE-4934-96B7-59DFD8746EE5}
+		{4F2ACC77-7868-425C-B9A1-C6A68488EA47} = {BE5C90DD-DCAE-4934-96B7-59DFD8746EE5}
+		{BE5C90DD-DCAE-4934-96B7-59DFD8746EE5} = {649B9C54-4FF3-4EEB-8FF8-F50CCD3F8EFB}
+		{F6FDA9BD-309C-4271-90DF-DADB15482EBD} = {50277FC9-3A7E-4EAE-8BF7-5CC23005D042}
+		{50277FC9-3A7E-4EAE-8BF7-5CC23005D042} = {649B9C54-4FF3-4EEB-8FF8-F50CCD3F8EFB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {68BF65EA-B5BA-44C6-8463-45BA1F186520}
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 74d8b6521253e..a16e9c621872f 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
@@ -33,6 +33,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Loggin
 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.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{C66BFC12-83ED-4131-8F16-C366185E4687}"
+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}"
@@ -41,12 +43,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{8B3671D1-A834-4456-89A7-40B5F13FC8D4}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{88C1F3B9-B92E-4847-AF86-A437FA34382B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{94673D00-C1BB-48F3-8A1B-75DDEA247AB0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{AC487C8F-3F9C-4E47-BB15-B46BA7494E4E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{76A0849D-0723-4FE5-B325-58AA7CF13D30}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{3F1F4584-53BA-4183-ABFA-9EAE22368383}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{DCBAFAAB-3812-4F34-9DE7-A406A349A38E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A89B7280-FEAC-45F2-A4A0-F302C471BB26}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D430F7D3-0FCA-4C78-9BBA-2E525DF7EABE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FF162B75-76DC-493E-8AE1-23CBDAC2A7A2}"
@@ -55,6 +65,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{67719AA1-52D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C77F6550-84B5-4C20-8541-8B6118A8651A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{DD1F186A-F6F9-4409-8CB3-81EBE93D68E5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{F530EA49-31FE-4827-BAE5-94F5701DD604}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{B35F055C-220D-4BF0-80A8-C39C4E4F0A7F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{22F11B95-D5E6-4F26-9C0C-E8D3A7F3F0A6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -129,6 +147,10 @@ Global
 		{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
+		{C66BFC12-83ED-4131-8F16-C366185E4687}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C66BFC12-83ED-4131-8F16-C366185E4687}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C66BFC12-83ED-4131-8F16-C366185E4687}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C66BFC12-83ED-4131-8F16-C366185E4687}.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
@@ -145,10 +167,6 @@ Global
 		{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
-		{8B3671D1-A834-4456-89A7-40B5F13FC8D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B3671D1-A834-4456-89A7-40B5F13FC8D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B3671D1-A834-4456-89A7-40B5F13FC8D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8B3671D1-A834-4456-89A7-40B5F13FC8D4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{88C1F3B9-B92E-4847-AF86-A437FA34382B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{88C1F3B9-B92E-4847-AF86-A437FA34382B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{88C1F3B9-B92E-4847-AF86-A437FA34382B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -157,6 +175,26 @@ Global
 		{94673D00-C1BB-48F3-8A1B-75DDEA247AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{94673D00-C1BB-48F3-8A1B-75DDEA247AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{94673D00-C1BB-48F3-8A1B-75DDEA247AB0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC487C8F-3F9C-4E47-BB15-B46BA7494E4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC487C8F-3F9C-4E47-BB15-B46BA7494E4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC487C8F-3F9C-4E47-BB15-B46BA7494E4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC487C8F-3F9C-4E47-BB15-B46BA7494E4E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76A0849D-0723-4FE5-B325-58AA7CF13D30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76A0849D-0723-4FE5-B325-58AA7CF13D30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76A0849D-0723-4FE5-B325-58AA7CF13D30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76A0849D-0723-4FE5-B325-58AA7CF13D30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F1F4584-53BA-4183-ABFA-9EAE22368383}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F1F4584-53BA-4183-ABFA-9EAE22368383}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F1F4584-53BA-4183-ABFA-9EAE22368383}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F1F4584-53BA-4183-ABFA-9EAE22368383}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCBAFAAB-3812-4F34-9DE7-A406A349A38E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCBAFAAB-3812-4F34-9DE7-A406A349A38E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCBAFAAB-3812-4F34-9DE7-A406A349A38E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCBAFAAB-3812-4F34-9DE7-A406A349A38E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A89B7280-FEAC-45F2-A4A0-F302C471BB26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A89B7280-FEAC-45F2-A4A0-F302C471BB26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A89B7280-FEAC-45F2-A4A0-F302C471BB26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A89B7280-FEAC-45F2-A4A0-F302C471BB26}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -183,9 +221,17 @@ Global
 		{A7F69E1A-D6DF-46A9-A347-66354425BC9E} = {C77F6550-84B5-4C20-8541-8B6118A8651A}
 		{11D672F4-D640-423D-A79A-2A5EA498D3BF} = {C77F6550-84B5-4C20-8541-8B6118A8651A}
 		{51A94A31-6734-4BD1-AACF-73A0D704C985} = {C77F6550-84B5-4C20-8541-8B6118A8651A}
-		{8B3671D1-A834-4456-89A7-40B5F13FC8D4} = {C77F6550-84B5-4C20-8541-8B6118A8651A}
+		{C66BFC12-83ED-4131-8F16-C366185E4687} = {C77F6550-84B5-4C20-8541-8B6118A8651A}
 		{88C1F3B9-B92E-4847-AF86-A437FA34382B} = {C77F6550-84B5-4C20-8541-8B6118A8651A}
 		{94673D00-C1BB-48F3-8A1B-75DDEA247AB0} = {C77F6550-84B5-4C20-8541-8B6118A8651A}
+		{AC487C8F-3F9C-4E47-BB15-B46BA7494E4E} = {DD1F186A-F6F9-4409-8CB3-81EBE93D68E5}
+		{76A0849D-0723-4FE5-B325-58AA7CF13D30} = {DD1F186A-F6F9-4409-8CB3-81EBE93D68E5}
+		{DD1F186A-F6F9-4409-8CB3-81EBE93D68E5} = {22F11B95-D5E6-4F26-9C0C-E8D3A7F3F0A6}
+		{3F1F4584-53BA-4183-ABFA-9EAE22368383} = {F530EA49-31FE-4827-BAE5-94F5701DD604}
+		{DCBAFAAB-3812-4F34-9DE7-A406A349A38E} = {F530EA49-31FE-4827-BAE5-94F5701DD604}
+		{F530EA49-31FE-4827-BAE5-94F5701DD604} = {22F11B95-D5E6-4F26-9C0C-E8D3A7F3F0A6}
+		{A89B7280-FEAC-45F2-A4A0-F302C471BB26} = {B35F055C-220D-4BF0-80A8-C39C4E4F0A7F}
+		{B35F055C-220D-4BF0-80A8-C39C4E4F0A7F} = {22F11B95-D5E6-4F26-9C0C-E8D3A7F3F0A6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {38ED157C-646E-43DD-B8B0-562DD5715E27}
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 bd7ea7708ccbe..f827b05854a4e 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
@@ -7,18 +7,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{EEE9E1A2-8512-4154-8B5D-532244B896CD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{7BD8F65C-820D-4F70-A02A-2F46FF105634}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{CB6528FF-88EB-402B-910C-9C64EABA0436}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{92E86957-5217-456B-B9CA-E0C204822367}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{E98D77D5-E88C-4E0A-A6BE-F97B48370A96}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{CFA06A25-EE15-40BC-A852-0E5AD8B40E26}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{39D78422-EB39-4395-BC79-1C81500CD9DE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{1368685E-816B-4C75-94E2-2B00556FFE66}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A8F94EE5-E485-4753-89F7-5CEF2F0A3B06}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B8E3F471-7DA8-4D1D-9468-21542AAD0A2B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{343DB133-E1E0-4FC0-896C-DA15D0C58AD5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0FE1CBCE-E173-4926-9CD1-64D7AE63A994}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{53E613E6-9657-4256-A4A5-479D23F0E43B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{792105CF-78A4-4DD2-BE6C-D86C6A666351}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C4D83B0C-9760-433B-AC79-356CA66491E9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{55758363-1568-48F4-9512-8DFE87E6867E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +57,6 @@ Global
 		{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
-		{7BD8F65C-820D-4F70-A02A-2F46FF105634}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BD8F65C-820D-4F70-A02A-2F46FF105634}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BD8F65C-820D-4F70-A02A-2F46FF105634}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7BD8F65C-820D-4F70-A02A-2F46FF105634}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB6528FF-88EB-402B-910C-9C64EABA0436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB6528FF-88EB-402B-910C-9C64EABA0436}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB6528FF-88EB-402B-910C-9C64EABA0436}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -53,6 +65,26 @@ Global
 		{92E86957-5217-456B-B9CA-E0C204822367}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{92E86957-5217-456B-B9CA-E0C204822367}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92E86957-5217-456B-B9CA-E0C204822367}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E98D77D5-E88C-4E0A-A6BE-F97B48370A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E98D77D5-E88C-4E0A-A6BE-F97B48370A96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E98D77D5-E88C-4E0A-A6BE-F97B48370A96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E98D77D5-E88C-4E0A-A6BE-F97B48370A96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CFA06A25-EE15-40BC-A852-0E5AD8B40E26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFA06A25-EE15-40BC-A852-0E5AD8B40E26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFA06A25-EE15-40BC-A852-0E5AD8B40E26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CFA06A25-EE15-40BC-A852-0E5AD8B40E26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39D78422-EB39-4395-BC79-1C81500CD9DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39D78422-EB39-4395-BC79-1C81500CD9DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39D78422-EB39-4395-BC79-1C81500CD9DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39D78422-EB39-4395-BC79-1C81500CD9DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1368685E-816B-4C75-94E2-2B00556FFE66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1368685E-816B-4C75-94E2-2B00556FFE66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1368685E-816B-4C75-94E2-2B00556FFE66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1368685E-816B-4C75-94E2-2B00556FFE66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8F94EE5-E485-4753-89F7-5CEF2F0A3B06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8F94EE5-E485-4753-89F7-5CEF2F0A3B06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8F94EE5-E485-4753-89F7-5CEF2F0A3B06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8F94EE5-E485-4753-89F7-5CEF2F0A3B06}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -62,9 +94,16 @@ Global
 		{711119F1-7759-49B9-8B66-EF72F4163729} = {B8E3F471-7DA8-4D1D-9468-21542AAD0A2B}
 		{CAA4A23C-2C58-4C93-87BA-CCC87260F20A} = {343DB133-E1E0-4FC0-896C-DA15D0C58AD5}
 		{EEE9E1A2-8512-4154-8B5D-532244B896CD} = {343DB133-E1E0-4FC0-896C-DA15D0C58AD5}
-		{7BD8F65C-820D-4F70-A02A-2F46FF105634} = {0FE1CBCE-E173-4926-9CD1-64D7AE63A994}
 		{CB6528FF-88EB-402B-910C-9C64EABA0436} = {0FE1CBCE-E173-4926-9CD1-64D7AE63A994}
 		{92E86957-5217-456B-B9CA-E0C204822367} = {0FE1CBCE-E173-4926-9CD1-64D7AE63A994}
+		{E98D77D5-E88C-4E0A-A6BE-F97B48370A96} = {53E613E6-9657-4256-A4A5-479D23F0E43B}
+		{CFA06A25-EE15-40BC-A852-0E5AD8B40E26} = {53E613E6-9657-4256-A4A5-479D23F0E43B}
+		{53E613E6-9657-4256-A4A5-479D23F0E43B} = {55758363-1568-48F4-9512-8DFE87E6867E}
+		{39D78422-EB39-4395-BC79-1C81500CD9DE} = {792105CF-78A4-4DD2-BE6C-D86C6A666351}
+		{1368685E-816B-4C75-94E2-2B00556FFE66} = {792105CF-78A4-4DD2-BE6C-D86C6A666351}
+		{792105CF-78A4-4DD2-BE6C-D86C6A666351} = {55758363-1568-48F4-9512-8DFE87E6867E}
+		{A8F94EE5-E485-4753-89F7-5CEF2F0A3B06} = {C4D83B0C-9760-433B-AC79-356CA66491E9}
+		{C4D83B0C-9760-433B-AC79-356CA66491E9} = {55758363-1568-48F4-9512-8DFE87E6867E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {35095991-4720-4061-A85F-72B39261D8C0}
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 328b6b9b5b19f..ac38e3aec99f6 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
@@ -55,6 +55,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Option
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{856C015E-982A-4834-88F7-3F8FFD33981C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{F132C649-6660-4583-8AD1-36D38711A994}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{2D5B1B6B-1557-4A14-BC00-C36A21BC97C4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{78D796C3-227B-4648-9BCB-2A000852B2F7}"
@@ -91,6 +93,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{94C9AA55-C6AD-41CC-B6C8-9186C27A6FFE}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{AA7E297B-0BD9-4E6B-96FE-BC69FC65DB64}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{D187AB48-A05A-4C8C-900D-7F2A3D87769A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{44059045-A065-4123-AF8C-107D06782422}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{EDE541FC-0F9D-4D3E-A513-7E74788B8C0B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{10106702-31E6-4D1A-BDE0-BB8F9F6C258D}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AAE738F3-89AC-4406-B1D9-A61A2C3A1CF0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F43534CA-C419-405E-B239-CDE2BDC703BE}"
@@ -99,6 +111,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{94EEF122-C30
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CC3961B0-C62D-44B9-91DB-11D94A3F91A5}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{04FEFFC9-5F1D-47CA-885C-3D7F9643D63D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{948EC8B5-A259-4D8C-B911-EDE19F5BAE40}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{8F2204E7-8124-4F7C-B663-8731C7959001}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{B343C975-AC74-4843-899C-623B6E7A6321}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -217,6 +237,10 @@ Global
 		{856C015E-982A-4834-88F7-3F8FFD33981C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{856C015E-982A-4834-88F7-3F8FFD33981C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{856C015E-982A-4834-88F7-3F8FFD33981C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F132C649-6660-4583-8AD1-36D38711A994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F132C649-6660-4583-8AD1-36D38711A994}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F132C649-6660-4583-8AD1-36D38711A994}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F132C649-6660-4583-8AD1-36D38711A994}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2D5B1B6B-1557-4A14-BC00-C36A21BC97C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2D5B1B6B-1557-4A14-BC00-C36A21BC97C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2D5B1B6B-1557-4A14-BC00-C36A21BC97C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -289,6 +313,26 @@ Global
 		{94C9AA55-C6AD-41CC-B6C8-9186C27A6FFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{94C9AA55-C6AD-41CC-B6C8-9186C27A6FFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{94C9AA55-C6AD-41CC-B6C8-9186C27A6FFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA7E297B-0BD9-4E6B-96FE-BC69FC65DB64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA7E297B-0BD9-4E6B-96FE-BC69FC65DB64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA7E297B-0BD9-4E6B-96FE-BC69FC65DB64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA7E297B-0BD9-4E6B-96FE-BC69FC65DB64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D187AB48-A05A-4C8C-900D-7F2A3D87769A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D187AB48-A05A-4C8C-900D-7F2A3D87769A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D187AB48-A05A-4C8C-900D-7F2A3D87769A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D187AB48-A05A-4C8C-900D-7F2A3D87769A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44059045-A065-4123-AF8C-107D06782422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44059045-A065-4123-AF8C-107D06782422}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44059045-A065-4123-AF8C-107D06782422}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44059045-A065-4123-AF8C-107D06782422}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDE541FC-0F9D-4D3E-A513-7E74788B8C0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDE541FC-0F9D-4D3E-A513-7E74788B8C0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDE541FC-0F9D-4D3E-A513-7E74788B8C0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDE541FC-0F9D-4D3E-A513-7E74788B8C0B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10106702-31E6-4D1A-BDE0-BB8F9F6C258D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10106702-31E6-4D1A-BDE0-BB8F9F6C258D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10106702-31E6-4D1A-BDE0-BB8F9F6C258D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10106702-31E6-4D1A-BDE0-BB8F9F6C258D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -334,12 +378,21 @@ Global
 		{5DF5B4A7-D78A-400E-A49E-54F33CA51006} = {94EEF122-C307-4BF0-88FE-263B89B59F9F}
 		{94C9AA55-C6AD-41CC-B6C8-9186C27A6FFE} = {94EEF122-C307-4BF0-88FE-263B89B59F9F}
 		{D4B3EEA1-7394-49EA-A088-897C0CD26D11} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5}
+		{F132C649-6660-4583-8AD1-36D38711A994} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5}
 		{9E2C43CF-2E01-4570-8C02-F678607DDAFF} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5}
 		{05B7F752-4991-4DC8-9B06-8269211E7817} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5}
 		{6E58AF2F-AB35-4279-9135-67E97BCE1432} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5}
 		{D2FE6BEA-70F5-4AE3-8D29-DB6568A9DE49} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5}
 		{47E22F0C-5F36-450B-8020-B83B36936597} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5}
 		{4A2E7449-5480-4872-91B3-B5A479D6A787} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5}
+		{AA7E297B-0BD9-4E6B-96FE-BC69FC65DB64} = {04FEFFC9-5F1D-47CA-885C-3D7F9643D63D}
+		{D187AB48-A05A-4C8C-900D-7F2A3D87769A} = {04FEFFC9-5F1D-47CA-885C-3D7F9643D63D}
+		{04FEFFC9-5F1D-47CA-885C-3D7F9643D63D} = {B343C975-AC74-4843-899C-623B6E7A6321}
+		{44059045-A065-4123-AF8C-107D06782422} = {948EC8B5-A259-4D8C-B911-EDE19F5BAE40}
+		{EDE541FC-0F9D-4D3E-A513-7E74788B8C0B} = {948EC8B5-A259-4D8C-B911-EDE19F5BAE40}
+		{948EC8B5-A259-4D8C-B911-EDE19F5BAE40} = {B343C975-AC74-4843-899C-623B6E7A6321}
+		{10106702-31E6-4D1A-BDE0-BB8F9F6C258D} = {8F2204E7-8124-4F7C-B663-8731C7959001}
+		{8F2204E7-8124-4F7C-B663-8731C7959001} = {B343C975-AC74-4843-899C-623B6E7A6321}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A97DC4BF-32F0-46E8-B91C-84D1E7F2A27E}
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 bd073f9fdd043..5b4aec3e1591f 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
@@ -29,12 +29,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{DD7282C4-85F7-4C0F-9E43-1EC487A5FD20}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{4E08739F-A5F9-44CD-B90C-398A33FDF172}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{085296E6-03AF-485A-BBF9-538E27DF269D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{EFCE9CE3-9F0E-442A-97CF-01113E3F2A0A}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{4BC663D6-2D40-4DF3-9640-09321F1853BC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{04AE44D5-E27B-4901-914A-E1DEB97590DB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{62E274E9-604F-4EAC-8B77-EF2B3D1C605F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{834433EF-3AEC-4252-BBEC-F4FF2675DECA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{FB8F172A-2A4B-4955-818B-890D1E2F743B}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{54F971EC-DA31-4060-B0D3-CE89F62E4B40}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9AF531D0-D6CC-4C76-90BD-ED0F725A604E}"
@@ -43,6 +51,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F8D4BCC4-4B1
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{24F3652F-573B-445E-8690-BE73B8F0A2C7}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{6798366E-2129-4EA8-99FD-725A4CA62DE4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D2EEBBD5-2FC5-43FE-A272-BA15C362526A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{B38A6FBD-B121-4F74-84F9-9ABA6A7E52F6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{6122803F-DF67-4481-95C8-699C26EE6B59}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -109,10 +125,6 @@ Global
 		{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
-		{4E08739F-A5F9-44CD-B90C-398A33FDF172}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E08739F-A5F9-44CD-B90C-398A33FDF172}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E08739F-A5F9-44CD-B90C-398A33FDF172}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4E08739F-A5F9-44CD-B90C-398A33FDF172}.Release|Any CPU.Build.0 = Release|Any CPU
 		{085296E6-03AF-485A-BBF9-538E27DF269D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{085296E6-03AF-485A-BBF9-538E27DF269D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{085296E6-03AF-485A-BBF9-538E27DF269D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -121,6 +133,26 @@ Global
 		{EFCE9CE3-9F0E-442A-97CF-01113E3F2A0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFCE9CE3-9F0E-442A-97CF-01113E3F2A0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFCE9CE3-9F0E-442A-97CF-01113E3F2A0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4BC663D6-2D40-4DF3-9640-09321F1853BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BC663D6-2D40-4DF3-9640-09321F1853BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4BC663D6-2D40-4DF3-9640-09321F1853BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4BC663D6-2D40-4DF3-9640-09321F1853BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04AE44D5-E27B-4901-914A-E1DEB97590DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04AE44D5-E27B-4901-914A-E1DEB97590DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04AE44D5-E27B-4901-914A-E1DEB97590DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04AE44D5-E27B-4901-914A-E1DEB97590DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62E274E9-604F-4EAC-8B77-EF2B3D1C605F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62E274E9-604F-4EAC-8B77-EF2B3D1C605F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62E274E9-604F-4EAC-8B77-EF2B3D1C605F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62E274E9-604F-4EAC-8B77-EF2B3D1C605F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{834433EF-3AEC-4252-BBEC-F4FF2675DECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{834433EF-3AEC-4252-BBEC-F4FF2675DECA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{834433EF-3AEC-4252-BBEC-F4FF2675DECA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{834433EF-3AEC-4252-BBEC-F4FF2675DECA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB8F172A-2A4B-4955-818B-890D1E2F743B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB8F172A-2A4B-4955-818B-890D1E2F743B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB8F172A-2A4B-4955-818B-890D1E2F743B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB8F172A-2A4B-4955-818B-890D1E2F743B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -141,9 +173,16 @@ Global
 		{27EB8901-D9CB-4814-8565-8D2CE564F2C8} = {F8D4BCC4-4B13-4EFC-A5AE-38C26519EDDF}
 		{DD7282C4-85F7-4C0F-9E43-1EC487A5FD20} = {F8D4BCC4-4B13-4EFC-A5AE-38C26519EDDF}
 		{666035CA-DF32-4759-8E5D-5845F137FE2C} = {24F3652F-573B-445E-8690-BE73B8F0A2C7}
-		{4E08739F-A5F9-44CD-B90C-398A33FDF172} = {24F3652F-573B-445E-8690-BE73B8F0A2C7}
 		{085296E6-03AF-485A-BBF9-538E27DF269D} = {24F3652F-573B-445E-8690-BE73B8F0A2C7}
 		{EFCE9CE3-9F0E-442A-97CF-01113E3F2A0A} = {24F3652F-573B-445E-8690-BE73B8F0A2C7}
+		{4BC663D6-2D40-4DF3-9640-09321F1853BC} = {6798366E-2129-4EA8-99FD-725A4CA62DE4}
+		{04AE44D5-E27B-4901-914A-E1DEB97590DB} = {6798366E-2129-4EA8-99FD-725A4CA62DE4}
+		{6798366E-2129-4EA8-99FD-725A4CA62DE4} = {6122803F-DF67-4481-95C8-699C26EE6B59}
+		{62E274E9-604F-4EAC-8B77-EF2B3D1C605F} = {D2EEBBD5-2FC5-43FE-A272-BA15C362526A}
+		{834433EF-3AEC-4252-BBEC-F4FF2675DECA} = {D2EEBBD5-2FC5-43FE-A272-BA15C362526A}
+		{D2EEBBD5-2FC5-43FE-A272-BA15C362526A} = {6122803F-DF67-4481-95C8-699C26EE6B59}
+		{FB8F172A-2A4B-4955-818B-890D1E2F743B} = {B38A6FBD-B121-4F74-84F9-9ABA6A7E52F6}
+		{B38A6FBD-B121-4F74-84F9-9ABA6A7E52F6} = {6122803F-DF67-4481-95C8-699C26EE6B59}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B21C5DA8-5B94-485F-913D-CDF943AFCAD6}
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 f8a3ae9bf515c..969519febf700 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
@@ -29,12 +29,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{73CB2C25-1A22-479C-9FC0-CE65BFE272DB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{8C9DCB50-7F83-47A4-9EF7-D10953B6C0E5}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{8931287A-8B13-415E-9043-2E2BB8A09F2D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{45730CA0-CC0F-4D63-8E2E-08A4414599EC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{B909A98C-3265-440A-8417-F3472E95EAF4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{6AFC4513-94DE-4B45-BC93-BF88BF13B9F0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{821C408A-ED16-48AE-8271-57683700638E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{87EB5422-095E-4882-9315-08014F2106B4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{516FFF77-9595-4378-A170-97B19F2B5E9D}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{24FA2158-5073-48F7-94DE-11DD7AAE86DD}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{96A7E0DD-290C-45D7-9556-1B45F474F72E}"
@@ -43,6 +51,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D5A074D2-033
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{8F8CE472-78AF-419D-8D46-9DF1CAACD48E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CCB95EA0-6D55-44F2-A02F-88CE1C1BA70E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D6DF2EC4-10BD-4C3A-A3FD-C7CFAB88B09E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{E288E955-B587-4543-B067-7A2A4CCF24B6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{BC4071EB-9642-4C04-B19A-01F74B46BB9F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -109,10 +125,6 @@ Global
 		{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
-		{8C9DCB50-7F83-47A4-9EF7-D10953B6C0E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C9DCB50-7F83-47A4-9EF7-D10953B6C0E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C9DCB50-7F83-47A4-9EF7-D10953B6C0E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C9DCB50-7F83-47A4-9EF7-D10953B6C0E5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8931287A-8B13-415E-9043-2E2BB8A09F2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8931287A-8B13-415E-9043-2E2BB8A09F2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8931287A-8B13-415E-9043-2E2BB8A09F2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -121,6 +133,26 @@ Global
 		{45730CA0-CC0F-4D63-8E2E-08A4414599EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{45730CA0-CC0F-4D63-8E2E-08A4414599EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{45730CA0-CC0F-4D63-8E2E-08A4414599EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B909A98C-3265-440A-8417-F3472E95EAF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B909A98C-3265-440A-8417-F3472E95EAF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B909A98C-3265-440A-8417-F3472E95EAF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B909A98C-3265-440A-8417-F3472E95EAF4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AFC4513-94DE-4B45-BC93-BF88BF13B9F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AFC4513-94DE-4B45-BC93-BF88BF13B9F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AFC4513-94DE-4B45-BC93-BF88BF13B9F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6AFC4513-94DE-4B45-BC93-BF88BF13B9F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{821C408A-ED16-48AE-8271-57683700638E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{821C408A-ED16-48AE-8271-57683700638E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{821C408A-ED16-48AE-8271-57683700638E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{821C408A-ED16-48AE-8271-57683700638E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87EB5422-095E-4882-9315-08014F2106B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87EB5422-095E-4882-9315-08014F2106B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87EB5422-095E-4882-9315-08014F2106B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87EB5422-095E-4882-9315-08014F2106B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{516FFF77-9595-4378-A170-97B19F2B5E9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{516FFF77-9595-4378-A170-97B19F2B5E9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{516FFF77-9595-4378-A170-97B19F2B5E9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{516FFF77-9595-4378-A170-97B19F2B5E9D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -141,9 +173,16 @@ Global
 		{3D1CF09A-2A49-4F79-89F3-C04EC00FFC32} = {D5A074D2-033F-4577-A5CC-568CAC9CC729}
 		{73CB2C25-1A22-479C-9FC0-CE65BFE272DB} = {D5A074D2-033F-4577-A5CC-568CAC9CC729}
 		{AB77DCB0-99E3-45F5-BD7A-96FF34FAC245} = {8F8CE472-78AF-419D-8D46-9DF1CAACD48E}
-		{8C9DCB50-7F83-47A4-9EF7-D10953B6C0E5} = {8F8CE472-78AF-419D-8D46-9DF1CAACD48E}
 		{8931287A-8B13-415E-9043-2E2BB8A09F2D} = {8F8CE472-78AF-419D-8D46-9DF1CAACD48E}
 		{45730CA0-CC0F-4D63-8E2E-08A4414599EC} = {8F8CE472-78AF-419D-8D46-9DF1CAACD48E}
+		{B909A98C-3265-440A-8417-F3472E95EAF4} = {CCB95EA0-6D55-44F2-A02F-88CE1C1BA70E}
+		{6AFC4513-94DE-4B45-BC93-BF88BF13B9F0} = {CCB95EA0-6D55-44F2-A02F-88CE1C1BA70E}
+		{CCB95EA0-6D55-44F2-A02F-88CE1C1BA70E} = {BC4071EB-9642-4C04-B19A-01F74B46BB9F}
+		{821C408A-ED16-48AE-8271-57683700638E} = {D6DF2EC4-10BD-4C3A-A3FD-C7CFAB88B09E}
+		{87EB5422-095E-4882-9315-08014F2106B4} = {D6DF2EC4-10BD-4C3A-A3FD-C7CFAB88B09E}
+		{D6DF2EC4-10BD-4C3A-A3FD-C7CFAB88B09E} = {BC4071EB-9642-4C04-B19A-01F74B46BB9F}
+		{516FFF77-9595-4378-A170-97B19F2B5E9D} = {E288E955-B587-4543-B067-7A2A4CCF24B6}
+		{E288E955-B587-4543-B067-7A2A4CCF24B6} = {BC4071EB-9642-4C04-B19A-01F74B46BB9F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FD52C33A-D95E-4E76-B817-12A125C4418A}
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 522ab25b31b54..61201b5481b72 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
@@ -31,12 +31,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{96F56B6D-B82D-433A-95CB-A35179529934}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{12943188-A4E3-44FC-A75E-8228362F2942}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{3064B45D-E4A3-47CC-8F7C-1635A647F738}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C57D0E23-18B5-4EAE-8E69-433171C57C01}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{51626848-29B2-4B8D-9C16-CF36096EAEDC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{ECA79973-C00F-4FBD-A5A4-3398B132C5EE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{CBA98E95-E860-4C77-BA22-EF2A59D68B33}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{5F7F1A7E-99E3-44C1-BC2F-E96D5F05E39E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{FB0BCBFD-CA54-4D8D-BBAF-48500AE50D89}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AD777611-BD18-4241-9426-24B01BD78A22}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5D71F187-E70B-413D-9819-03F6C1D7AA34}"
@@ -45,6 +53,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D55A8909-619
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{4DFFE138-A7D8-4B2D-9FA6-B26635D29EFF}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{6A27AADF-5939-4F52-87CB-DAE472C8B7C5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{967C99B7-CBCD-4A8D-B0B7-605723E606C6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{840D8F70-E951-4F75-BEAC-AF70A18CFC1C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{71728FB3-39A3-4C25-AF6D-C7E5DC8E0FEB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -115,10 +131,6 @@ Global
 		{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
-		{12943188-A4E3-44FC-A75E-8228362F2942}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12943188-A4E3-44FC-A75E-8228362F2942}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12943188-A4E3-44FC-A75E-8228362F2942}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12943188-A4E3-44FC-A75E-8228362F2942}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3064B45D-E4A3-47CC-8F7C-1635A647F738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3064B45D-E4A3-47CC-8F7C-1635A647F738}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3064B45D-E4A3-47CC-8F7C-1635A647F738}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -127,6 +139,26 @@ Global
 		{C57D0E23-18B5-4EAE-8E69-433171C57C01}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C57D0E23-18B5-4EAE-8E69-433171C57C01}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C57D0E23-18B5-4EAE-8E69-433171C57C01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51626848-29B2-4B8D-9C16-CF36096EAEDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51626848-29B2-4B8D-9C16-CF36096EAEDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51626848-29B2-4B8D-9C16-CF36096EAEDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51626848-29B2-4B8D-9C16-CF36096EAEDC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECA79973-C00F-4FBD-A5A4-3398B132C5EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECA79973-C00F-4FBD-A5A4-3398B132C5EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECA79973-C00F-4FBD-A5A4-3398B132C5EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECA79973-C00F-4FBD-A5A4-3398B132C5EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBA98E95-E860-4C77-BA22-EF2A59D68B33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBA98E95-E860-4C77-BA22-EF2A59D68B33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBA98E95-E860-4C77-BA22-EF2A59D68B33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBA98E95-E860-4C77-BA22-EF2A59D68B33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F7F1A7E-99E3-44C1-BC2F-E96D5F05E39E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F7F1A7E-99E3-44C1-BC2F-E96D5F05E39E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F7F1A7E-99E3-44C1-BC2F-E96D5F05E39E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F7F1A7E-99E3-44C1-BC2F-E96D5F05E39E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB0BCBFD-CA54-4D8D-BBAF-48500AE50D89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB0BCBFD-CA54-4D8D-BBAF-48500AE50D89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB0BCBFD-CA54-4D8D-BBAF-48500AE50D89}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB0BCBFD-CA54-4D8D-BBAF-48500AE50D89}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -148,9 +180,16 @@ Global
 		{D49BC1CE-AE45-47D1-A662-9F4C0300930D} = {D55A8909-6199-44E5-A5DC-339F3FC2BF2B}
 		{7E4BF22A-B413-40E4-88C9-6579502B17F9} = {D55A8909-6199-44E5-A5DC-339F3FC2BF2B}
 		{96F56B6D-B82D-433A-95CB-A35179529934} = {D55A8909-6199-44E5-A5DC-339F3FC2BF2B}
-		{12943188-A4E3-44FC-A75E-8228362F2942} = {4DFFE138-A7D8-4B2D-9FA6-B26635D29EFF}
 		{3064B45D-E4A3-47CC-8F7C-1635A647F738} = {4DFFE138-A7D8-4B2D-9FA6-B26635D29EFF}
 		{C57D0E23-18B5-4EAE-8E69-433171C57C01} = {4DFFE138-A7D8-4B2D-9FA6-B26635D29EFF}
+		{51626848-29B2-4B8D-9C16-CF36096EAEDC} = {6A27AADF-5939-4F52-87CB-DAE472C8B7C5}
+		{ECA79973-C00F-4FBD-A5A4-3398B132C5EE} = {6A27AADF-5939-4F52-87CB-DAE472C8B7C5}
+		{6A27AADF-5939-4F52-87CB-DAE472C8B7C5} = {71728FB3-39A3-4C25-AF6D-C7E5DC8E0FEB}
+		{CBA98E95-E860-4C77-BA22-EF2A59D68B33} = {967C99B7-CBCD-4A8D-B0B7-605723E606C6}
+		{5F7F1A7E-99E3-44C1-BC2F-E96D5F05E39E} = {967C99B7-CBCD-4A8D-B0B7-605723E606C6}
+		{967C99B7-CBCD-4A8D-B0B7-605723E606C6} = {71728FB3-39A3-4C25-AF6D-C7E5DC8E0FEB}
+		{FB0BCBFD-CA54-4D8D-BBAF-48500AE50D89} = {840D8F70-E951-4F75-BEAC-AF70A18CFC1C}
+		{840D8F70-E951-4F75-BEAC-AF70A18CFC1C} = {71728FB3-39A3-4C25-AF6D-C7E5DC8E0FEB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9E1D104F-EEB9-457A-9942-83E43C869D8C}
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 532342014a6e6..a4fdf815e173e 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
@@ -41,12 +41,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{3FAB6852-68A1-4317-B972-6B8088AB6DCF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{A36DD3B7-0BD8-476B-9EE6-9748D6982E35}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{3C6E7802-EA64-4225-A695-583A1D08E3A6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{5CF9010C-D0A8-4DCA-800C-57F38FC9D159}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{76674EB7-50F1-4581-84CC-5A10056641CC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{4E6BA64D-C5F3-4FFC-810D-E961F66953E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{CC78BC0E-3C16-44F5-A27D-9AD31E511942}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{2BE466DA-9C38-4246-BB41-ADAA9BB978A3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{D564D0CE-D526-41AB-B6E1-63479CC610A9}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2D219A1E-5D93-44B4-8BA2-64BA01E1FE93}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{54A3306A-C2A0-4C59-8BC9-B0389E079ADB}"
@@ -55,6 +63,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E562A241-425
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{1FEF4F42-130B-4504-A561-17191FE763C3}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{3E16581F-C5C2-4935-BA70-0BE08A878F7B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{143C5C96-A4EE-4897-87A9-704A6CC8F888}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{9FF96548-EF43-40AE-A65B-B544678D8924}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{43D6D492-0108-42A2-9DB3-965DB8D9D5CA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -145,10 +161,6 @@ Global
 		{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
-		{A36DD3B7-0BD8-476B-9EE6-9748D6982E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A36DD3B7-0BD8-476B-9EE6-9748D6982E35}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A36DD3B7-0BD8-476B-9EE6-9748D6982E35}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A36DD3B7-0BD8-476B-9EE6-9748D6982E35}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3C6E7802-EA64-4225-A695-583A1D08E3A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3C6E7802-EA64-4225-A695-583A1D08E3A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3C6E7802-EA64-4225-A695-583A1D08E3A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -157,6 +169,26 @@ Global
 		{5CF9010C-D0A8-4DCA-800C-57F38FC9D159}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5CF9010C-D0A8-4DCA-800C-57F38FC9D159}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5CF9010C-D0A8-4DCA-800C-57F38FC9D159}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76674EB7-50F1-4581-84CC-5A10056641CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76674EB7-50F1-4581-84CC-5A10056641CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76674EB7-50F1-4581-84CC-5A10056641CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76674EB7-50F1-4581-84CC-5A10056641CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E6BA64D-C5F3-4FFC-810D-E961F66953E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E6BA64D-C5F3-4FFC-810D-E961F66953E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E6BA64D-C5F3-4FFC-810D-E961F66953E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E6BA64D-C5F3-4FFC-810D-E961F66953E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC78BC0E-3C16-44F5-A27D-9AD31E511942}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC78BC0E-3C16-44F5-A27D-9AD31E511942}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC78BC0E-3C16-44F5-A27D-9AD31E511942}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC78BC0E-3C16-44F5-A27D-9AD31E511942}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BE466DA-9C38-4246-BB41-ADAA9BB978A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BE466DA-9C38-4246-BB41-ADAA9BB978A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BE466DA-9C38-4246-BB41-ADAA9BB978A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BE466DA-9C38-4246-BB41-ADAA9BB978A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D564D0CE-D526-41AB-B6E1-63479CC610A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D564D0CE-D526-41AB-B6E1-63479CC610A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D564D0CE-D526-41AB-B6E1-63479CC610A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D564D0CE-D526-41AB-B6E1-63479CC610A9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -183,9 +215,16 @@ Global
 		{F3FA11C3-612D-4F2B-9A2B-5D3FDCF1C077} = {E562A241-4253-44F8-9E3F-2E03C4058D7B}
 		{3FAB6852-68A1-4317-B972-6B8088AB6DCF} = {E562A241-4253-44F8-9E3F-2E03C4058D7B}
 		{BAFE33FD-877B-4CC8-89CC-467576FC67FA} = {1FEF4F42-130B-4504-A561-17191FE763C3}
-		{A36DD3B7-0BD8-476B-9EE6-9748D6982E35} = {1FEF4F42-130B-4504-A561-17191FE763C3}
 		{3C6E7802-EA64-4225-A695-583A1D08E3A6} = {1FEF4F42-130B-4504-A561-17191FE763C3}
 		{5CF9010C-D0A8-4DCA-800C-57F38FC9D159} = {1FEF4F42-130B-4504-A561-17191FE763C3}
+		{76674EB7-50F1-4581-84CC-5A10056641CC} = {3E16581F-C5C2-4935-BA70-0BE08A878F7B}
+		{4E6BA64D-C5F3-4FFC-810D-E961F66953E8} = {3E16581F-C5C2-4935-BA70-0BE08A878F7B}
+		{3E16581F-C5C2-4935-BA70-0BE08A878F7B} = {43D6D492-0108-42A2-9DB3-965DB8D9D5CA}
+		{CC78BC0E-3C16-44F5-A27D-9AD31E511942} = {143C5C96-A4EE-4897-87A9-704A6CC8F888}
+		{2BE466DA-9C38-4246-BB41-ADAA9BB978A3} = {143C5C96-A4EE-4897-87A9-704A6CC8F888}
+		{143C5C96-A4EE-4897-87A9-704A6CC8F888} = {43D6D492-0108-42A2-9DB3-965DB8D9D5CA}
+		{D564D0CE-D526-41AB-B6E1-63479CC610A9} = {9FF96548-EF43-40AE-A65B-B544678D8924}
+		{9FF96548-EF43-40AE-A65B-B544678D8924} = {43D6D492-0108-42A2-9DB3-965DB8D9D5CA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4D8FAA33-E9C8-48FB-ADBF-5AE1D87E9B2C}
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 5e3188a20a45c..1e2d481a30df3 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
@@ -73,6 +73,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{85BA5E06-42E3-470B-BC52-44E76AD95416}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{3D8AF2F2-E248-4E46-A4D9-3F6723B80A71}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{1652C69A-7217-4869-A63B-37046DA140AF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{C82D30A0-9EFB-4486-9083-2A4DA147FCA9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{3B645954-DC7E-427C-89B0-AA32825AB393}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9C37B729-046B-4419-ADAD-18081467884C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1F57E720-CBFF-4648-A507-EFCBCECB5FD3}"
@@ -81,6 +91,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1789A282-9C0
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B4A09B09-2C03-4FC7-B12F-5DD6FC10A5B1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{4A53588F-1002-42FB-8717-D68E3FF3FBB8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{BCE093E3-BDD7-42E6-B0D5-D3F8B1F9C642}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{21E6D03C-C9D3-413A-8173-7145A9D677C4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{D65A8E3B-3CD9-4EA7-91AA-697A66E538A9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -235,6 +253,26 @@ Global
 		{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
+		{85BA5E06-42E3-470B-BC52-44E76AD95416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85BA5E06-42E3-470B-BC52-44E76AD95416}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85BA5E06-42E3-470B-BC52-44E76AD95416}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85BA5E06-42E3-470B-BC52-44E76AD95416}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D8AF2F2-E248-4E46-A4D9-3F6723B80A71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D8AF2F2-E248-4E46-A4D9-3F6723B80A71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D8AF2F2-E248-4E46-A4D9-3F6723B80A71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D8AF2F2-E248-4E46-A4D9-3F6723B80A71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1652C69A-7217-4869-A63B-37046DA140AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1652C69A-7217-4869-A63B-37046DA140AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1652C69A-7217-4869-A63B-37046DA140AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1652C69A-7217-4869-A63B-37046DA140AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C82D30A0-9EFB-4486-9083-2A4DA147FCA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C82D30A0-9EFB-4486-9083-2A4DA147FCA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C82D30A0-9EFB-4486-9083-2A4DA147FCA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C82D30A0-9EFB-4486-9083-2A4DA147FCA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B645954-DC7E-427C-89B0-AA32825AB393}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B645954-DC7E-427C-89B0-AA32825AB393}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B645954-DC7E-427C-89B0-AA32825AB393}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B645954-DC7E-427C-89B0-AA32825AB393}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -277,6 +315,14 @@ Global
 		{CC3E9E0A-4417-4678-87CC-1D2B001C3232} = {B4A09B09-2C03-4FC7-B12F-5DD6FC10A5B1}
 		{701D92CA-90E0-4611-B1DF-F2D31503563F} = {B4A09B09-2C03-4FC7-B12F-5DD6FC10A5B1}
 		{33B45D1D-587A-47CB-A7A7-DFAD65B1AB5F} = {B4A09B09-2C03-4FC7-B12F-5DD6FC10A5B1}
+		{85BA5E06-42E3-470B-BC52-44E76AD95416} = {4A53588F-1002-42FB-8717-D68E3FF3FBB8}
+		{3D8AF2F2-E248-4E46-A4D9-3F6723B80A71} = {4A53588F-1002-42FB-8717-D68E3FF3FBB8}
+		{4A53588F-1002-42FB-8717-D68E3FF3FBB8} = {D65A8E3B-3CD9-4EA7-91AA-697A66E538A9}
+		{1652C69A-7217-4869-A63B-37046DA140AF} = {BCE093E3-BDD7-42E6-B0D5-D3F8B1F9C642}
+		{C82D30A0-9EFB-4486-9083-2A4DA147FCA9} = {BCE093E3-BDD7-42E6-B0D5-D3F8B1F9C642}
+		{BCE093E3-BDD7-42E6-B0D5-D3F8B1F9C642} = {D65A8E3B-3CD9-4EA7-91AA-697A66E538A9}
+		{3B645954-DC7E-427C-89B0-AA32825AB393} = {21E6D03C-C9D3-413A-8173-7145A9D677C4}
+		{21E6D03C-C9D3-413A-8173-7145A9D677C4} = {D65A8E3B-3CD9-4EA7-91AA-697A66E538A9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2D9A0B20-A56C-4FBA-805A-DAAA97615597}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln
index c01f0cc3dff1c..55c7c7e951025 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
@@ -71,6 +71,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{749491A3-83C6-4A6C-A3A7-049896871DDF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{C09A7367-B9D9-42BD-8EF2-538E53F756C7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{3714949E-81E5-4D12-9A8E-8673E2FF519C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{CA5EE848-4F1F-4424-97AE-77B9F399203E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{9EBF3CED-78E6-4DA5-9B23-FC0F91C11770}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2434A707-1012-4104-81A0-1A1B25D9FEEA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}"
@@ -79,6 +89,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B5EF5DDD-EB9
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{48CD61B8-2937-4229-8BAB-3F1167B54E61}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{6918E83F-B61D-4E29-9975-B3D3BF1CB91B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{AB733485-D500-4230-9A54-5DD3172AAC19}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{6C72D457-8386-4E1A-B5F7-9083A606BD28}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{1DBD9987-E1DF-4AA6-8909-97C83E7B2BEA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -229,6 +247,26 @@ Global
 		{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
+		{749491A3-83C6-4A6C-A3A7-049896871DDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{749491A3-83C6-4A6C-A3A7-049896871DDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{749491A3-83C6-4A6C-A3A7-049896871DDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{749491A3-83C6-4A6C-A3A7-049896871DDF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C09A7367-B9D9-42BD-8EF2-538E53F756C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C09A7367-B9D9-42BD-8EF2-538E53F756C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C09A7367-B9D9-42BD-8EF2-538E53F756C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C09A7367-B9D9-42BD-8EF2-538E53F756C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3714949E-81E5-4D12-9A8E-8673E2FF519C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3714949E-81E5-4D12-9A8E-8673E2FF519C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3714949E-81E5-4D12-9A8E-8673E2FF519C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3714949E-81E5-4D12-9A8E-8673E2FF519C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA5EE848-4F1F-4424-97AE-77B9F399203E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA5EE848-4F1F-4424-97AE-77B9F399203E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA5EE848-4F1F-4424-97AE-77B9F399203E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA5EE848-4F1F-4424-97AE-77B9F399203E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9EBF3CED-78E6-4DA5-9B23-FC0F91C11770}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EBF3CED-78E6-4DA5-9B23-FC0F91C11770}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EBF3CED-78E6-4DA5-9B23-FC0F91C11770}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9EBF3CED-78E6-4DA5-9B23-FC0F91C11770}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -270,6 +308,14 @@ Global
 		{C5BA84F6-C75B-4698-9733-38C67C285215} = {48CD61B8-2937-4229-8BAB-3F1167B54E61}
 		{D52BA380-089D-46CD-98E5-F471B9D7CCA4} = {48CD61B8-2937-4229-8BAB-3F1167B54E61}
 		{1630193B-055E-46C0-8341-60AFCEE606BE} = {48CD61B8-2937-4229-8BAB-3F1167B54E61}
+		{749491A3-83C6-4A6C-A3A7-049896871DDF} = {6918E83F-B61D-4E29-9975-B3D3BF1CB91B}
+		{C09A7367-B9D9-42BD-8EF2-538E53F756C7} = {6918E83F-B61D-4E29-9975-B3D3BF1CB91B}
+		{6918E83F-B61D-4E29-9975-B3D3BF1CB91B} = {1DBD9987-E1DF-4AA6-8909-97C83E7B2BEA}
+		{3714949E-81E5-4D12-9A8E-8673E2FF519C} = {AB733485-D500-4230-9A54-5DD3172AAC19}
+		{CA5EE848-4F1F-4424-97AE-77B9F399203E} = {AB733485-D500-4230-9A54-5DD3172AAC19}
+		{AB733485-D500-4230-9A54-5DD3172AAC19} = {1DBD9987-E1DF-4AA6-8909-97C83E7B2BEA}
+		{9EBF3CED-78E6-4DA5-9B23-FC0F91C11770} = {6C72D457-8386-4E1A-B5F7-9083A606BD28}
+		{6C72D457-8386-4E1A-B5F7-9083A606BD28} = {1DBD9987-E1DF-4AA6-8909-97C83E7B2BEA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E7F79175-49DD-42AD-833B-AE64950FE3D2}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln b/src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln
index 96c63912e4c61..06a49cc8344c9 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
@@ -65,6 +65,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 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}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{59DCA8A0-A480-441D-BC20-6BCDDDA7DBBD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{13FB1F3E-00B9-4A4F-AFB4-5E2D132FB397}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{1B1F4EE6-068A-4B4F-9EC8-115820BDF1C6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{3992766B-9A98-45F2-9B51-C9719ED3A783}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{4C6BFA35-7C99-498A-AE06-F64C23BD894D}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AC596411-85F4-49FD-8A23-BE2983825CF1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AB0BAC3A-1FE6-4649-83DF-DC165669C74F}"
@@ -73,6 +83,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{373E0EA7-D9A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A3D28D8F-E2E7-4A24-A8E6-12C51D7A55E9}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{E8CBBF0B-CA7F-46F8-BBA7-94520481757B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{F47ADA8B-C91C-44B9-8429-11FFEEA91D4F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{4782A3FC-8BF4-4A88-90D0-81260EA0FAE9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{5AF32CB5-2C73-4084-AE6D-10ECCB45C857}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -211,6 +229,26 @@ Global
 		{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
+		{59DCA8A0-A480-441D-BC20-6BCDDDA7DBBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59DCA8A0-A480-441D-BC20-6BCDDDA7DBBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59DCA8A0-A480-441D-BC20-6BCDDDA7DBBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59DCA8A0-A480-441D-BC20-6BCDDDA7DBBD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13FB1F3E-00B9-4A4F-AFB4-5E2D132FB397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13FB1F3E-00B9-4A4F-AFB4-5E2D132FB397}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13FB1F3E-00B9-4A4F-AFB4-5E2D132FB397}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13FB1F3E-00B9-4A4F-AFB4-5E2D132FB397}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B1F4EE6-068A-4B4F-9EC8-115820BDF1C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B1F4EE6-068A-4B4F-9EC8-115820BDF1C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B1F4EE6-068A-4B4F-9EC8-115820BDF1C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B1F4EE6-068A-4B4F-9EC8-115820BDF1C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3992766B-9A98-45F2-9B51-C9719ED3A783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3992766B-9A98-45F2-9B51-C9719ED3A783}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3992766B-9A98-45F2-9B51-C9719ED3A783}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3992766B-9A98-45F2-9B51-C9719ED3A783}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C6BFA35-7C99-498A-AE06-F64C23BD894D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C6BFA35-7C99-498A-AE06-F64C23BD894D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C6BFA35-7C99-498A-AE06-F64C23BD894D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C6BFA35-7C99-498A-AE06-F64C23BD894D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -249,6 +287,14 @@ Global
 		{38A073CB-D9DA-4075-B8A1-57B491AA0CDA} = {A3D28D8F-E2E7-4A24-A8E6-12C51D7A55E9}
 		{03B854C7-609C-4C64-B7EA-266D65E2E548} = {A3D28D8F-E2E7-4A24-A8E6-12C51D7A55E9}
 		{B9613E48-832E-496D-9788-C2304BBEAF1F} = {A3D28D8F-E2E7-4A24-A8E6-12C51D7A55E9}
+		{59DCA8A0-A480-441D-BC20-6BCDDDA7DBBD} = {E8CBBF0B-CA7F-46F8-BBA7-94520481757B}
+		{13FB1F3E-00B9-4A4F-AFB4-5E2D132FB397} = {E8CBBF0B-CA7F-46F8-BBA7-94520481757B}
+		{E8CBBF0B-CA7F-46F8-BBA7-94520481757B} = {5AF32CB5-2C73-4084-AE6D-10ECCB45C857}
+		{1B1F4EE6-068A-4B4F-9EC8-115820BDF1C6} = {F47ADA8B-C91C-44B9-8429-11FFEEA91D4F}
+		{3992766B-9A98-45F2-9B51-C9719ED3A783} = {F47ADA8B-C91C-44B9-8429-11FFEEA91D4F}
+		{F47ADA8B-C91C-44B9-8429-11FFEEA91D4F} = {5AF32CB5-2C73-4084-AE6D-10ECCB45C857}
+		{4C6BFA35-7C99-498A-AE06-F64C23BD894D} = {4782A3FC-8BF4-4A88-90D0-81260EA0FAE9}
+		{4782A3FC-8BF4-4A88-90D0-81260EA0FAE9} = {5AF32CB5-2C73-4084-AE6D-10ECCB45C857}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {830494DE-07B3-4C63-9D74-4A123677D469}
diff --git a/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln b/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
index 9c83b58427f2f..38e6d37d1411c 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
@@ -109,6 +109,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 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}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{341F69B0-6597-4F20-8D2A-E458CB15C436}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{220CB513-2766-4120-9CF0-B0A9B9E6F828}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{561FB58C-62B8-4617-848E-F39DE671D480}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{48D993F0-FACF-4960-8C69-16E1AEEC8909}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{9FBD9AB2-8125-45A0-8868-AA5321373BE9}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CEC96DEF-9D43-4EFC-962B-B4F80EFA5C78}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DC224BF8-12E5-4992-B750-B12011238C26}"
@@ -117,6 +127,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{76107BEB-02C
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{DCF01C23-85A0-4385-B480-D1276ED99A92}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D82FB13A-8138-4F91-95E9-B7436D57A59F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{DC64E88B-0F70-4178-AFF0-56CFA7089A9F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{8388958F-21BC-4DA2-97CA-931546D3C7A3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{EA0F327E-6C34-4BAD-8913-5C18E8686405}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -343,6 +361,26 @@ Global
 		{41234DB5-1F3A-4E4A-8BD9-4A277C249666}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{41234DB5-1F3A-4E4A-8BD9-4A277C249666}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41234DB5-1F3A-4E4A-8BD9-4A277C249666}.Release|Any CPU.Build.0 = Release|Any CPU
+		{341F69B0-6597-4F20-8D2A-E458CB15C436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{341F69B0-6597-4F20-8D2A-E458CB15C436}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{341F69B0-6597-4F20-8D2A-E458CB15C436}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{341F69B0-6597-4F20-8D2A-E458CB15C436}.Release|Any CPU.Build.0 = Release|Any CPU
+		{220CB513-2766-4120-9CF0-B0A9B9E6F828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{220CB513-2766-4120-9CF0-B0A9B9E6F828}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{220CB513-2766-4120-9CF0-B0A9B9E6F828}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{220CB513-2766-4120-9CF0-B0A9B9E6F828}.Release|Any CPU.Build.0 = Release|Any CPU
+		{561FB58C-62B8-4617-848E-F39DE671D480}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{561FB58C-62B8-4617-848E-F39DE671D480}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{561FB58C-62B8-4617-848E-F39DE671D480}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{561FB58C-62B8-4617-848E-F39DE671D480}.Release|Any CPU.Build.0 = Release|Any CPU
+		{48D993F0-FACF-4960-8C69-16E1AEEC8909}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48D993F0-FACF-4960-8C69-16E1AEEC8909}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48D993F0-FACF-4960-8C69-16E1AEEC8909}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{48D993F0-FACF-4960-8C69-16E1AEEC8909}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FBD9AB2-8125-45A0-8868-AA5321373BE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FBD9AB2-8125-45A0-8868-AA5321373BE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FBD9AB2-8125-45A0-8868-AA5321373BE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FBD9AB2-8125-45A0-8868-AA5321373BE9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -403,6 +441,14 @@ Global
 		{11C8AB75-D137-4A1B-85E5-1018EBFB422B} = {DCF01C23-85A0-4385-B480-D1276ED99A92}
 		{81104506-C075-4889-819C-F0B3D81A40A1} = {DCF01C23-85A0-4385-B480-D1276ED99A92}
 		{E53C22E4-3827-4540-8616-B09FD71AE779} = {DCF01C23-85A0-4385-B480-D1276ED99A92}
+		{341F69B0-6597-4F20-8D2A-E458CB15C436} = {D82FB13A-8138-4F91-95E9-B7436D57A59F}
+		{220CB513-2766-4120-9CF0-B0A9B9E6F828} = {D82FB13A-8138-4F91-95E9-B7436D57A59F}
+		{D82FB13A-8138-4F91-95E9-B7436D57A59F} = {EA0F327E-6C34-4BAD-8913-5C18E8686405}
+		{561FB58C-62B8-4617-848E-F39DE671D480} = {DC64E88B-0F70-4178-AFF0-56CFA7089A9F}
+		{48D993F0-FACF-4960-8C69-16E1AEEC8909} = {DC64E88B-0F70-4178-AFF0-56CFA7089A9F}
+		{DC64E88B-0F70-4178-AFF0-56CFA7089A9F} = {EA0F327E-6C34-4BAD-8913-5C18E8686405}
+		{9FBD9AB2-8125-45A0-8868-AA5321373BE9} = {8388958F-21BC-4DA2-97CA-931546D3C7A3}
+		{8388958F-21BC-4DA2-97CA-931546D3C7A3} = {EA0F327E-6C34-4BAD-8913-5C18E8686405}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {81EEF2A5-6387-4CC4-B7CD-908EEA4E5C79}
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 27640ece4b324..9ec285d66437a 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
@@ -7,18 +7,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
 EndProject
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{A74051F2-F34C-4228-84B2-6E3D8A2D9F26}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{DAC5CD72-8A72-40C3-BD9D-703B7CB6FE04}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B7469EEF-415C-485B-9FEC-3D9640400A7B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{C1EC51FB-C819-4CC5-9600-42CCE195DE78}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{A3FEEE13-7E52-4C07-B34E-2E038FC8D401}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{208A6B66-AE7A-4F3B-952F-15DBD4082B09}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{0DE02827-B5FA-44D2-8734-BF35C64DCBA5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{8DE4021B-2C3E-4DB2-A33A-A26FBF527118}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C494A755-24D9-4E80-AEC3-CF8FEBAFCAC6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{09E0C315-2A88-4F30-93DA-E22625BF82AB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BF723277-314D-45F4-B29A-6A8683860A93}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{83FB9805-C27B-4039-A30D-7010422CCDCE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{AFDBFE98-A0B4-438E-80CA-76EF08ED147C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C3153DA2-4E6B-4C20-BE3E-52EBFB82A7E4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{D0ECC80D-6923-404D-AF6E-852A7D7CCE0A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +57,6 @@ Global
 		{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
-		{A74051F2-F34C-4228-84B2-6E3D8A2D9F26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A74051F2-F34C-4228-84B2-6E3D8A2D9F26}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A74051F2-F34C-4228-84B2-6E3D8A2D9F26}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A74051F2-F34C-4228-84B2-6E3D8A2D9F26}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DAC5CD72-8A72-40C3-BD9D-703B7CB6FE04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DAC5CD72-8A72-40C3-BD9D-703B7CB6FE04}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DAC5CD72-8A72-40C3-BD9D-703B7CB6FE04}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -53,6 +65,26 @@ Global
 		{B7469EEF-415C-485B-9FEC-3D9640400A7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B7469EEF-415C-485B-9FEC-3D9640400A7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B7469EEF-415C-485B-9FEC-3D9640400A7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1EC51FB-C819-4CC5-9600-42CCE195DE78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1EC51FB-C819-4CC5-9600-42CCE195DE78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1EC51FB-C819-4CC5-9600-42CCE195DE78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1EC51FB-C819-4CC5-9600-42CCE195DE78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3FEEE13-7E52-4C07-B34E-2E038FC8D401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3FEEE13-7E52-4C07-B34E-2E038FC8D401}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3FEEE13-7E52-4C07-B34E-2E038FC8D401}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3FEEE13-7E52-4C07-B34E-2E038FC8D401}.Release|Any CPU.Build.0 = Release|Any CPU
+		{208A6B66-AE7A-4F3B-952F-15DBD4082B09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{208A6B66-AE7A-4F3B-952F-15DBD4082B09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{208A6B66-AE7A-4F3B-952F-15DBD4082B09}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{208A6B66-AE7A-4F3B-952F-15DBD4082B09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DE02827-B5FA-44D2-8734-BF35C64DCBA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DE02827-B5FA-44D2-8734-BF35C64DCBA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DE02827-B5FA-44D2-8734-BF35C64DCBA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DE02827-B5FA-44D2-8734-BF35C64DCBA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DE4021B-2C3E-4DB2-A33A-A26FBF527118}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DE4021B-2C3E-4DB2-A33A-A26FBF527118}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DE4021B-2C3E-4DB2-A33A-A26FBF527118}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DE4021B-2C3E-4DB2-A33A-A26FBF527118}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -62,9 +94,16 @@ Global
 		{B8B63EFF-64D9-49AB-ACE9-6182DADC7574} = {C494A755-24D9-4E80-AEC3-CF8FEBAFCAC6}
 		{F170EDB3-E92B-456A-8749-F3ACE3471510} = {09E0C315-2A88-4F30-93DA-E22625BF82AB}
 		{D1AEAA98-0D46-4E23-8644-6BD5EBCE32AF} = {09E0C315-2A88-4F30-93DA-E22625BF82AB}
-		{A74051F2-F34C-4228-84B2-6E3D8A2D9F26} = {BF723277-314D-45F4-B29A-6A8683860A93}
 		{DAC5CD72-8A72-40C3-BD9D-703B7CB6FE04} = {BF723277-314D-45F4-B29A-6A8683860A93}
 		{B7469EEF-415C-485B-9FEC-3D9640400A7B} = {BF723277-314D-45F4-B29A-6A8683860A93}
+		{C1EC51FB-C819-4CC5-9600-42CCE195DE78} = {83FB9805-C27B-4039-A30D-7010422CCDCE}
+		{A3FEEE13-7E52-4C07-B34E-2E038FC8D401} = {83FB9805-C27B-4039-A30D-7010422CCDCE}
+		{83FB9805-C27B-4039-A30D-7010422CCDCE} = {D0ECC80D-6923-404D-AF6E-852A7D7CCE0A}
+		{208A6B66-AE7A-4F3B-952F-15DBD4082B09} = {AFDBFE98-A0B4-438E-80CA-76EF08ED147C}
+		{0DE02827-B5FA-44D2-8734-BF35C64DCBA5} = {AFDBFE98-A0B4-438E-80CA-76EF08ED147C}
+		{AFDBFE98-A0B4-438E-80CA-76EF08ED147C} = {D0ECC80D-6923-404D-AF6E-852A7D7CCE0A}
+		{8DE4021B-2C3E-4DB2-A33A-A26FBF527118} = {C3153DA2-4E6B-4C20-BE3E-52EBFB82A7E4}
+		{C3153DA2-4E6B-4C20-BE3E-52EBFB82A7E4} = {D0ECC80D-6923-404D-AF6E-852A7D7CCE0A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BD3A79CE-CF84-4543-99E4-D39D56E8DAEF}
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln b/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln
index c5fc810017080..9345a6ded34b0 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln
@@ -15,16 +15,26 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
 EndProject
 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}") = "CollectibleAssembly", "tests\CollectibleAssembly\CollectibleAssembly.csproj", "{2C6983BB-3CB4-4EB7-9AF1-2F24FE1ECEAB}"
+EndProject
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{75694FB9-6B49-4D17-9B26-8B75AD54FD62}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{FD3C8D4F-0EAA-4575-A685-F77C6D340E60}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9E5124E4-BEDA-4B2D-9699-60E2A7B1881D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{C85FD264-C77B-44F3-926C-D61C5DAD369E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{A2CD66D3-74F2-4608-A56E-F866CC494620}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{45502850-3207-49B0-9F5D-5DE95091DB5A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{B1E4A89A-6451-4484-B42B-4D1DF21B6961}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{7E8189DE-6BBA-4CD5-9BA6-DF5ADBD027D3}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5F2D3A6A-76D3-4C22-A7F7-8D73D67A98F8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E168C5B8-F2EB-4BDE-942A-59C1EB130D59}"
@@ -33,6 +43,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{74C4FAFF-491
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{28065F40-B930-4A5D-95D8-A3BD5F86CE11}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0B56ECAF-7B4A-4135-A343-1577ACE09920}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{5DD887A4-ED78-4782-B372-34176C27F0C1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{6FA0C03B-0901-4FD8-AF44-D4C9E5516C2F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{D6F10CF9-982E-4D09-A112-0CBFD2D46AFF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -71,6 +89,10 @@ Global
 		{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
+		{2C6983BB-3CB4-4EB7-9AF1-2F24FE1ECEAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C6983BB-3CB4-4EB7-9AF1-2F24FE1ECEAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C6983BB-3CB4-4EB7-9AF1-2F24FE1ECEAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C6983BB-3CB4-4EB7-9AF1-2F24FE1ECEAB}.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
@@ -79,10 +101,6 @@ Global
 		{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
-		{75694FB9-6B49-4D17-9B26-8B75AD54FD62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75694FB9-6B49-4D17-9B26-8B75AD54FD62}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75694FB9-6B49-4D17-9B26-8B75AD54FD62}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75694FB9-6B49-4D17-9B26-8B75AD54FD62}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FD3C8D4F-0EAA-4575-A685-F77C6D340E60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD3C8D4F-0EAA-4575-A685-F77C6D340E60}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD3C8D4F-0EAA-4575-A685-F77C6D340E60}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -91,12 +109,33 @@ Global
 		{9E5124E4-BEDA-4B2D-9699-60E2A7B1881D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9E5124E4-BEDA-4B2D-9699-60E2A7B1881D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E5124E4-BEDA-4B2D-9699-60E2A7B1881D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C85FD264-C77B-44F3-926C-D61C5DAD369E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C85FD264-C77B-44F3-926C-D61C5DAD369E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C85FD264-C77B-44F3-926C-D61C5DAD369E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C85FD264-C77B-44F3-926C-D61C5DAD369E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2CD66D3-74F2-4608-A56E-F866CC494620}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2CD66D3-74F2-4608-A56E-F866CC494620}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2CD66D3-74F2-4608-A56E-F866CC494620}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2CD66D3-74F2-4608-A56E-F866CC494620}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45502850-3207-49B0-9F5D-5DE95091DB5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45502850-3207-49B0-9F5D-5DE95091DB5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45502850-3207-49B0-9F5D-5DE95091DB5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45502850-3207-49B0-9F5D-5DE95091DB5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1E4A89A-6451-4484-B42B-4D1DF21B6961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1E4A89A-6451-4484-B42B-4D1DF21B6961}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1E4A89A-6451-4484-B42B-4D1DF21B6961}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1E4A89A-6451-4484-B42B-4D1DF21B6961}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E8189DE-6BBA-4CD5-9BA6-DF5ADBD027D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E8189DE-6BBA-4CD5-9BA6-DF5ADBD027D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E8189DE-6BBA-4CD5-9BA6-DF5ADBD027D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E8189DE-6BBA-4CD5-9BA6-DF5ADBD027D3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{30201F60-A891-4C3F-A1A6-DDDD1C8525E3} = {5F2D3A6A-76D3-4C22-A7F7-8D73D67A98F8}
+		{2C6983BB-3CB4-4EB7-9AF1-2F24FE1ECEAB} = {5F2D3A6A-76D3-4C22-A7F7-8D73D67A98F8}
 		{F11DD75C-122C-4B98-9EED-F71551F9562A} = {5F2D3A6A-76D3-4C22-A7F7-8D73D67A98F8}
 		{1EE6CA66-6585-459D-8889-666D4C2D4C27} = {5F2D3A6A-76D3-4C22-A7F7-8D73D67A98F8}
 		{047FD3F2-B3A0-4639-B4F0-40D29E61725D} = {E168C5B8-F2EB-4BDE-942A-59C1EB130D59}
@@ -106,9 +145,16 @@ Global
 		{9CD9F9EB-379C-44C1-9016-33DFEC821C76} = {74C4FAFF-491D-448C-8CA0-F8E5FC838CC5}
 		{4532D9F9-1E0D-4A62-8038-D3454B255E86} = {74C4FAFF-491D-448C-8CA0-F8E5FC838CC5}
 		{C5ECD02C-FA5A-4B56-9CA2-47AD8989714A} = {74C4FAFF-491D-448C-8CA0-F8E5FC838CC5}
-		{75694FB9-6B49-4D17-9B26-8B75AD54FD62} = {28065F40-B930-4A5D-95D8-A3BD5F86CE11}
 		{FD3C8D4F-0EAA-4575-A685-F77C6D340E60} = {28065F40-B930-4A5D-95D8-A3BD5F86CE11}
 		{9E5124E4-BEDA-4B2D-9699-60E2A7B1881D} = {28065F40-B930-4A5D-95D8-A3BD5F86CE11}
+		{C85FD264-C77B-44F3-926C-D61C5DAD369E} = {0B56ECAF-7B4A-4135-A343-1577ACE09920}
+		{A2CD66D3-74F2-4608-A56E-F866CC494620} = {0B56ECAF-7B4A-4135-A343-1577ACE09920}
+		{0B56ECAF-7B4A-4135-A343-1577ACE09920} = {D6F10CF9-982E-4D09-A112-0CBFD2D46AFF}
+		{45502850-3207-49B0-9F5D-5DE95091DB5A} = {5DD887A4-ED78-4782-B372-34176C27F0C1}
+		{B1E4A89A-6451-4484-B42B-4D1DF21B6961} = {5DD887A4-ED78-4782-B372-34176C27F0C1}
+		{5DD887A4-ED78-4782-B372-34176C27F0C1} = {D6F10CF9-982E-4D09-A112-0CBFD2D46AFF}
+		{7E8189DE-6BBA-4CD5-9BA6-DF5ADBD027D3} = {6FA0C03B-0901-4FD8-AF44-D4C9E5516C2F}
+		{6FA0C03B-0901-4FD8-AF44-D4C9E5516C2F} = {D6F10CF9-982E-4D09-A112-0CBFD2D46AFF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {68A7BDA7-8093-433C-BF7A-8A6A7560BD02}
diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln b/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln
index 6ee0aaca0e645..7faec76ce42e0 100644
--- a/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln
+++ b/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln
@@ -41,6 +41,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{69691ED6-ECDB-4AFB-87FA-BED4F8489746}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{0CA9C0FD-7D04-4EB8-9567-06171C795552}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{B9F77365-105E-4FED-B0CE-83568C16B46C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{718E999B-18AE-4A65-A010-BFF0B8E3FB39}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{417E717C-B67C-4CCF-BD8B-5662016DC17E}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{155C3F40-F63D-49DF-87D3-A3EEA27036E8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{50BA55F5-BD05-4C05-910F-2BFD20BD3465}"
@@ -49,6 +59,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5725D7DF-DC3
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{55D04C80-4A8F-40AC-967D-3FA77C814D7B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{9C13782D-F7D7-4F02-A39D-D7BD992EB257}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D9691871-5357-4B81-9B4E-A94394515042}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C5220846-E0E3-4326-B2C1-C3535910E354}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{FDECE2E5-8E54-4DF7-95D4-35BB8D8432AA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -139,6 +157,26 @@ Global
 		{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
+		{69691ED6-ECDB-4AFB-87FA-BED4F8489746}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69691ED6-ECDB-4AFB-87FA-BED4F8489746}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69691ED6-ECDB-4AFB-87FA-BED4F8489746}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69691ED6-ECDB-4AFB-87FA-BED4F8489746}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CA9C0FD-7D04-4EB8-9567-06171C795552}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CA9C0FD-7D04-4EB8-9567-06171C795552}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CA9C0FD-7D04-4EB8-9567-06171C795552}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CA9C0FD-7D04-4EB8-9567-06171C795552}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9F77365-105E-4FED-B0CE-83568C16B46C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9F77365-105E-4FED-B0CE-83568C16B46C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9F77365-105E-4FED-B0CE-83568C16B46C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9F77365-105E-4FED-B0CE-83568C16B46C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{718E999B-18AE-4A65-A010-BFF0B8E3FB39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{718E999B-18AE-4A65-A010-BFF0B8E3FB39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{718E999B-18AE-4A65-A010-BFF0B8E3FB39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{718E999B-18AE-4A65-A010-BFF0B8E3FB39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{417E717C-B67C-4CCF-BD8B-5662016DC17E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{417E717C-B67C-4CCF-BD8B-5662016DC17E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{417E717C-B67C-4CCF-BD8B-5662016DC17E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{417E717C-B67C-4CCF-BD8B-5662016DC17E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -165,6 +203,14 @@ Global
 		{240E7B1C-6D7D-4932-9598-815C2EA420AF} = {55D04C80-4A8F-40AC-967D-3FA77C814D7B}
 		{B4C5A0BE-3E21-4464-875C-E6EBED176EE3} = {55D04C80-4A8F-40AC-967D-3FA77C814D7B}
 		{30DEAC25-AFDB-4E91-90A4-7B94E1809C59} = {55D04C80-4A8F-40AC-967D-3FA77C814D7B}
+		{69691ED6-ECDB-4AFB-87FA-BED4F8489746} = {9C13782D-F7D7-4F02-A39D-D7BD992EB257}
+		{0CA9C0FD-7D04-4EB8-9567-06171C795552} = {9C13782D-F7D7-4F02-A39D-D7BD992EB257}
+		{9C13782D-F7D7-4F02-A39D-D7BD992EB257} = {FDECE2E5-8E54-4DF7-95D4-35BB8D8432AA}
+		{B9F77365-105E-4FED-B0CE-83568C16B46C} = {D9691871-5357-4B81-9B4E-A94394515042}
+		{718E999B-18AE-4A65-A010-BFF0B8E3FB39} = {D9691871-5357-4B81-9B4E-A94394515042}
+		{D9691871-5357-4B81-9B4E-A94394515042} = {FDECE2E5-8E54-4DF7-95D4-35BB8D8432AA}
+		{417E717C-B67C-4CCF-BD8B-5662016DC17E} = {C5220846-E0E3-4326-B2C1-C3535910E354}
+		{C5220846-E0E3-4326-B2C1-C3535910E354} = {FDECE2E5-8E54-4DF7-95D4-35BB8D8432AA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {810D114A-26F4-4151-9EFE-29A7F1BF62AA}
diff --git a/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/Microsoft.Extensions.Diagnostics.Abstractions.sln b/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/Microsoft.Extensions.Diagnostics.Abstractions.sln
index 4e51f48f75fba..87e92fa7c67c6 100644
--- a/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/Microsoft.Extensions.Diagnostics.Abstractions.sln
+++ b/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/Microsoft.Extensions.Diagnostics.Abstractions.sln
@@ -1,8 +1,4 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.7.33711.374
-MinimumVisualStudioVersion = 10.0.40219.1
+Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{79CE8C7E-A4AF-413C-A54D-86F17073559C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{9052AC86-4B89-4311-BEF2-7C49FB72DC0F}"
@@ -13,17 +9,63 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{527CCF66-AC37-487C-871E-A4F6B94E1731}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj", "{7FC1EF40-C815-4046-956E-79E9A359BC46}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{305A2903-7F06-48C7-92B6-B9D11B34DCC0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "ref\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{EF2C8F2A-6088-4A89-9AE2-9C2FDFB0241C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "src\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{0588387D-FB65-4BA9-A8B2-DA6790027CC2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions.Tests", "tests\Microsoft.Extensions.Diagnostics.Abstractions.Tests.csproj", "{CB373FE5-F976-4CB2-A04E-6188D67A5816}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{AA2E94ED-4C40-4028-84E5-7459EDB8F66E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{DB82EB74-4E33-4552-968C-C159FA5F58D1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{D2AF2EAB-409E-48B8-8D48-BE21719FCAF2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{F2B87668-F1C2-48ED-B91F-7BB03EA5F9A0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{3C3BAA89-2A16-46D8-B50B-101174989814}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{EF6988FC-AE49-4E27-910F-A06434211988}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{A4117DE8-D141-4B09-9A83-4FA4E497FECC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{40058320-9546-45A9-9D6E-CC80EB2E4D95}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2DB6B79C-C8B4-428F-AC57-1B5947C75021}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{25420CB4-919B-4299-A8CB-1190E22438F2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{69D08457-EC2F-4BC8-A562-6154C2D6D2DC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{50B9EFE8-8D38-4D22-9423-F27356D8EFA7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{67447640-728F-4EEE-B72C-D50AD846D633}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{A0ACAB64-B9CF-463F-8F91-03C27B844D81}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{C9E4ED0B-7843-41C3-8B7B-A26FFEFDE2D5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{15494052-EEA2-495F-8B49-CD5106285B5B}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7631380A-FB73-4241-9987-0891A21E9769}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{548DF5F7-790C-4A1C-89EB-BD904CA1BA86}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "src\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{0588387D-FB65-4BA9-A8B2-DA6790027CC2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D64F512B-CF20-4CE0-8FE8-1E65C1A84E90}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "ref\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{EF2C8F2A-6088-4A89-9AE2-9C2FDFB0241C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D4B78CD9-7251-426B-AA22-48BC8EDD396A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions.Tests", "tests\Microsoft.Extensions.Diagnostics.Abstractions.Tests.csproj", "{CB373FE5-F976-4CB2-A04E-6188D67A5816}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{5B72137B-CC84-4E53-A26C-A5340E6705E4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{4DD04777-7D32-4165-B249-8F1719787B81}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{CAFF07D6-5F29-4D97-9618-78EC8B9BA082}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,31 +93,124 @@ Global
 		{527CCF66-AC37-487C-871E-A4F6B94E1731}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{527CCF66-AC37-487C-871E-A4F6B94E1731}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{527CCF66-AC37-487C-871E-A4F6B94E1731}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0588387D-FB65-4BA9-A8B2-DA6790027CC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0588387D-FB65-4BA9-A8B2-DA6790027CC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0588387D-FB65-4BA9-A8B2-DA6790027CC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0588387D-FB65-4BA9-A8B2-DA6790027CC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7FC1EF40-C815-4046-956E-79E9A359BC46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FC1EF40-C815-4046-956E-79E9A359BC46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FC1EF40-C815-4046-956E-79E9A359BC46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7FC1EF40-C815-4046-956E-79E9A359BC46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{305A2903-7F06-48C7-92B6-B9D11B34DCC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{305A2903-7F06-48C7-92B6-B9D11B34DCC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{305A2903-7F06-48C7-92B6-B9D11B34DCC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{305A2903-7F06-48C7-92B6-B9D11B34DCC0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EF2C8F2A-6088-4A89-9AE2-9C2FDFB0241C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EF2C8F2A-6088-4A89-9AE2-9C2FDFB0241C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EF2C8F2A-6088-4A89-9AE2-9C2FDFB0241C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF2C8F2A-6088-4A89-9AE2-9C2FDFB0241C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0588387D-FB65-4BA9-A8B2-DA6790027CC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0588387D-FB65-4BA9-A8B2-DA6790027CC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0588387D-FB65-4BA9-A8B2-DA6790027CC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0588387D-FB65-4BA9-A8B2-DA6790027CC2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB373FE5-F976-4CB2-A04E-6188D67A5816}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB373FE5-F976-4CB2-A04E-6188D67A5816}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB373FE5-F976-4CB2-A04E-6188D67A5816}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB373FE5-F976-4CB2-A04E-6188D67A5816}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA2E94ED-4C40-4028-84E5-7459EDB8F66E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA2E94ED-4C40-4028-84E5-7459EDB8F66E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA2E94ED-4C40-4028-84E5-7459EDB8F66E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA2E94ED-4C40-4028-84E5-7459EDB8F66E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB82EB74-4E33-4552-968C-C159FA5F58D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB82EB74-4E33-4552-968C-C159FA5F58D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB82EB74-4E33-4552-968C-C159FA5F58D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB82EB74-4E33-4552-968C-C159FA5F58D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2AF2EAB-409E-48B8-8D48-BE21719FCAF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2AF2EAB-409E-48B8-8D48-BE21719FCAF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2AF2EAB-409E-48B8-8D48-BE21719FCAF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2AF2EAB-409E-48B8-8D48-BE21719FCAF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F2B87668-F1C2-48ED-B91F-7BB03EA5F9A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2B87668-F1C2-48ED-B91F-7BB03EA5F9A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2B87668-F1C2-48ED-B91F-7BB03EA5F9A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2B87668-F1C2-48ED-B91F-7BB03EA5F9A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C3BAA89-2A16-46D8-B50B-101174989814}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C3BAA89-2A16-46D8-B50B-101174989814}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C3BAA89-2A16-46D8-B50B-101174989814}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C3BAA89-2A16-46D8-B50B-101174989814}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF6988FC-AE49-4E27-910F-A06434211988}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF6988FC-AE49-4E27-910F-A06434211988}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF6988FC-AE49-4E27-910F-A06434211988}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF6988FC-AE49-4E27-910F-A06434211988}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4117DE8-D141-4B09-9A83-4FA4E497FECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4117DE8-D141-4B09-9A83-4FA4E497FECC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4117DE8-D141-4B09-9A83-4FA4E497FECC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4117DE8-D141-4B09-9A83-4FA4E497FECC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40058320-9546-45A9-9D6E-CC80EB2E4D95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40058320-9546-45A9-9D6E-CC80EB2E4D95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40058320-9546-45A9-9D6E-CC80EB2E4D95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40058320-9546-45A9-9D6E-CC80EB2E4D95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DB6B79C-C8B4-428F-AC57-1B5947C75021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DB6B79C-C8B4-428F-AC57-1B5947C75021}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DB6B79C-C8B4-428F-AC57-1B5947C75021}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DB6B79C-C8B4-428F-AC57-1B5947C75021}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25420CB4-919B-4299-A8CB-1190E22438F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25420CB4-919B-4299-A8CB-1190E22438F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25420CB4-919B-4299-A8CB-1190E22438F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25420CB4-919B-4299-A8CB-1190E22438F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69D08457-EC2F-4BC8-A562-6154C2D6D2DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69D08457-EC2F-4BC8-A562-6154C2D6D2DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69D08457-EC2F-4BC8-A562-6154C2D6D2DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69D08457-EC2F-4BC8-A562-6154C2D6D2DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{50B9EFE8-8D38-4D22-9423-F27356D8EFA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50B9EFE8-8D38-4D22-9423-F27356D8EFA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50B9EFE8-8D38-4D22-9423-F27356D8EFA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50B9EFE8-8D38-4D22-9423-F27356D8EFA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67447640-728F-4EEE-B72C-D50AD846D633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67447640-728F-4EEE-B72C-D50AD846D633}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67447640-728F-4EEE-B72C-D50AD846D633}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67447640-728F-4EEE-B72C-D50AD846D633}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0ACAB64-B9CF-463F-8F91-03C27B844D81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0ACAB64-B9CF-463F-8F91-03C27B844D81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0ACAB64-B9CF-463F-8F91-03C27B844D81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0ACAB64-B9CF-463F-8F91-03C27B844D81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9E4ED0B-7843-41C3-8B7B-A26FFEFDE2D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9E4ED0B-7843-41C3-8B7B-A26FFEFDE2D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9E4ED0B-7843-41C3-8B7B-A26FFEFDE2D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9E4ED0B-7843-41C3-8B7B-A26FFEFDE2D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15494052-EEA2-495F-8B49-CD5106285B5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15494052-EEA2-495F-8B49-CD5106285B5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15494052-EEA2-495F-8B49-CD5106285B5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15494052-EEA2-495F-8B49-CD5106285B5B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{79CE8C7E-A4AF-413C-A54D-86F17073559C} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B}
+		{CB373FE5-F976-4CB2-A04E-6188D67A5816} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B}
 		{9052AC86-4B89-4311-BEF2-7C49FB72DC0F} = {7631380A-FB73-4241-9987-0891A21E9769}
-		{FA353FC1-2D03-426A-8973-0CDA8DF5E5DD} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86}
 		{D6778DF4-DA03-43E7-BD9D-2E2C35DCCE7F} = {7631380A-FB73-4241-9987-0891A21E9769}
+		{7FC1EF40-C815-4046-956E-79E9A359BC46} = {7631380A-FB73-4241-9987-0891A21E9769}
+		{EF2C8F2A-6088-4A89-9AE2-9C2FDFB0241C} = {7631380A-FB73-4241-9987-0891A21E9769}
+		{DB82EB74-4E33-4552-968C-C159FA5F58D1} = {7631380A-FB73-4241-9987-0891A21E9769}
+		{F2B87668-F1C2-48ED-B91F-7BB03EA5F9A0} = {7631380A-FB73-4241-9987-0891A21E9769}
+		{EF6988FC-AE49-4E27-910F-A06434211988} = {7631380A-FB73-4241-9987-0891A21E9769}
+		{69D08457-EC2F-4BC8-A562-6154C2D6D2DC} = {7631380A-FB73-4241-9987-0891A21E9769}
+		{FA353FC1-2D03-426A-8973-0CDA8DF5E5DD} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86}
 		{527CCF66-AC37-487C-871E-A4F6B94E1731} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86}
+		{305A2903-7F06-48C7-92B6-B9D11B34DCC0} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86}
 		{0588387D-FB65-4BA9-A8B2-DA6790027CC2} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86}
-		{EF2C8F2A-6088-4A89-9AE2-9C2FDFB0241C} = {7631380A-FB73-4241-9987-0891A21E9769}
-		{CB373FE5-F976-4CB2-A04E-6188D67A5816} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B}
+		{D2AF2EAB-409E-48B8-8D48-BE21719FCAF2} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86}
+		{3C3BAA89-2A16-46D8-B50B-101174989814} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86}
+		{A4117DE8-D141-4B09-9A83-4FA4E497FECC} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86}
+		{AA2E94ED-4C40-4028-84E5-7459EDB8F66E} = {D64F512B-CF20-4CE0-8FE8-1E65C1A84E90}
+		{40058320-9546-45A9-9D6E-CC80EB2E4D95} = {D64F512B-CF20-4CE0-8FE8-1E65C1A84E90}
+		{2DB6B79C-C8B4-428F-AC57-1B5947C75021} = {D64F512B-CF20-4CE0-8FE8-1E65C1A84E90}
+		{25420CB4-919B-4299-A8CB-1190E22438F2} = {D64F512B-CF20-4CE0-8FE8-1E65C1A84E90}
+		{50B9EFE8-8D38-4D22-9423-F27356D8EFA7} = {D4B78CD9-7251-426B-AA22-48BC8EDD396A}
+		{67447640-728F-4EEE-B72C-D50AD846D633} = {D4B78CD9-7251-426B-AA22-48BC8EDD396A}
+		{D4B78CD9-7251-426B-AA22-48BC8EDD396A} = {CAFF07D6-5F29-4D97-9618-78EC8B9BA082}
+		{A0ACAB64-B9CF-463F-8F91-03C27B844D81} = {5B72137B-CC84-4E53-A26C-A5340E6705E4}
+		{C9E4ED0B-7843-41C3-8B7B-A26FFEFDE2D5} = {5B72137B-CC84-4E53-A26C-A5340E6705E4}
+		{5B72137B-CC84-4E53-A26C-A5340E6705E4} = {CAFF07D6-5F29-4D97-9618-78EC8B9BA082}
+		{15494052-EEA2-495F-8B49-CD5106285B5B} = {4DD04777-7D32-4165-B249-8F1719787B81}
+		{4DD04777-7D32-4165-B249-8F1719787B81} = {CAFF07D6-5F29-4D97-9618-78EC8B9BA082}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {450DA749-CBDC-4BDC-950F-8A491CF59D49}
diff --git a/src/libraries/Microsoft.Extensions.Diagnostics/Microsoft.Extensions.Diagnostics.sln b/src/libraries/Microsoft.Extensions.Diagnostics/Microsoft.Extensions.Diagnostics.sln
index 5b249c373b11c..ebc921037a6d0 100644
--- a/src/libraries/Microsoft.Extensions.Diagnostics/Microsoft.Extensions.Diagnostics.sln
+++ b/src/libraries/Microsoft.Extensions.Diagnostics/Microsoft.Extensions.Diagnostics.sln
@@ -1,14 +1,24 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.6.33801.468
-MinimumVisualStudioVersion = 10.0.40219.1
+Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B6663ACE-6FE4-4BB4-8B35-AB98EF62EAAE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{E7A3B914-598D-4ABC-B973-6CC444DAFE52}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{280FDDEA-50B1-4BD3-83B1-475B15829538}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{2D529E61-474E-45C6-8A7E-35AAD70B9801}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{30E93D8B-4B53-4DC1-A5E3-FCAC1E37303D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder.SourceGeneration", "..\Microsoft.Extensions.Configuration.Binder\gen\Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj", "{1F3CFA6D-3142-4616-8A46-F05C7BBF1EC6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{D835A0A8-C213-461F-8B41-6F2715DBEC43}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{ECF14067-8633-4DDA-8EAE-124989F8E09E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{57AF678A-3671-4B9E-9608-053E2197D0A4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{A77E804D-4576-4962-A248-92E538ED997C}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{CE53C256-EE31-4E4A-8A05-70350840448F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{3B8833A4-2E9E-47BD-93DE-65934DCEB9A6}"
@@ -17,61 +27,67 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{1D851FA7-2F3C-4E3C-8F22-AF5E13D9BEE6}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\ref\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{AA790584-200C-4301-8545-8B2854B2F6CC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\src\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{40525D17-4553-405E-8B21-4603B07D126A}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "ref\Microsoft.Extensions.Diagnostics.csproj", "{EF75497C-6CB7-4471-980A-619EA1AB8CF6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "src\Microsoft.Extensions.Diagnostics.csproj", "{09E28D94-B771-48EB-800C-5A80C2C0055C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Tests", "tests\Microsoft.Extensions.Diagnostics.Tests.csproj", "{43DBAD84-A865-4F5F-AB76-7F3EB6784E99}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{F452AA57-7BEC-4E64-BAB5-166078865EC4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\ref\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{F2C0D619-8CAF-4F81-B681-3F75AF79661F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{AE5566CE-EC5E-47B0-B5A3-89E90B3893F0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{A2853038-B04A-4BAA-B0B4-0481457003B8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{ED105ED3-0060-4035-AD5E-1F857F94C2DF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{14375EFA-3F3D-4D48-8C83-56356BCF8DB3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{0A0D7CB1-3864-478F-98FC-5AA53C6A72C2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{DBAB1C82-A3A0-4ADC-95BC-B87557C61C42}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{3FEA305D-0B5F-46A6-8E18-587387FCBFBF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{B233AB55-788C-48B6-9557-098B8D0DDBFF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{3D040E9F-C39B-49C6-8C87-68D427AECA8F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{6BB43905-3DBD-47E4-A38F-2BE319300B15}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{711B2905-FDC7-4D67-B40B-9DEFF042CB01}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9BF048D0-411D-4C2A-8C32-3A3255501D27}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{F452AA57-7BEC-4E64-BAB5-166078865EC4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A447D0CB-601B-479E-A2B2-76E48F5D4D61}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{AE5566CE-EC5E-47B0-B5A3-89E90B3893F0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{66953A8A-9E31-486F-AF8E-7310F6707E4F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{ED105ED3-0060-4035-AD5E-1F857F94C2DF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\ref\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{AA790584-200C-4301-8545-8B2854B2F6CC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{0A0D7CB1-3864-478F-98FC-5AA53C6A72C2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\src\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{40525D17-4553-405E-8B21-4603B07D126A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{3FEA305D-0B5F-46A6-8E18-587387FCBFBF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{2D529E61-474E-45C6-8A7E-35AAD70B9801}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{3D040E9F-C39B-49C6-8C87-68D427AECA8F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{30E93D8B-4B53-4DC1-A5E3-FCAC1E37303D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{5AA24760-2385-4BFA-B32C-9AF2BCE647AB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions.Tests", "..\Microsoft.Extensions.Diagnostics.Abstractions\tests\Microsoft.Extensions.Diagnostics.Abstractions.Tests.csproj", "{2DC4F9C2-7C2B-4B8C-9AB3-74F3F06D359B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{62124842-8535-4697-896E-1D3177F8D501}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{A2853038-B04A-4BAA-B0B4-0481457003B8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{852F0BAC-D11B-4A19-B1CC-1EED41C7AA22}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{A77E804D-4576-4962-A248-92E538ED997C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{063D2ABE-3766-42D4-9C3C-0C6B78C7D744}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{DBAB1C82-A3A0-4ADC-95BC-B87557C61C42}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{3A80CEDD-891C-4867-9AD1-4A1734DBD34F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{6BB43905-3DBD-47E4-A38F-2BE319300B15}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{711B2905-FDC7-4D67-B40B-9DEFF042CB01}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9BF048D0-411D-4C2A-8C32-3A3255501D27}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{B233AB55-788C-48B6-9557-098B8D0DDBFF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A447D0CB-601B-479E-A2B2-76E48F5D4D61}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{ECF14067-8633-4DDA-8EAE-124989F8E09E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{66953A8A-9E31-486F-AF8E-7310F6707E4F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{D835A0A8-C213-461F-8B41-6F2715DBEC43}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{C3E784CB-8296-4960-B679-9A5D3153D5B5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\ref\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{F2C0D619-8CAF-4F81-B681-3F75AF79661F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{0D3332C5-9EE4-4051-BD99-EEC2036C3E80}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{57AF678A-3671-4B9E-9608-053E2197D0A4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{F30454AC-DA27-4412-BFC2-C43498B6B304}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{BAA0DDCC-9BB2-4535-9DE8-6B2DE3E7F65F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -91,6 +107,34 @@ Global
 		{280FDDEA-50B1-4BD3-83B1-475B15829538}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{280FDDEA-50B1-4BD3-83B1-475B15829538}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{280FDDEA-50B1-4BD3-83B1-475B15829538}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D529E61-474E-45C6-8A7E-35AAD70B9801}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D529E61-474E-45C6-8A7E-35AAD70B9801}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D529E61-474E-45C6-8A7E-35AAD70B9801}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D529E61-474E-45C6-8A7E-35AAD70B9801}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30E93D8B-4B53-4DC1-A5E3-FCAC1E37303D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30E93D8B-4B53-4DC1-A5E3-FCAC1E37303D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30E93D8B-4B53-4DC1-A5E3-FCAC1E37303D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30E93D8B-4B53-4DC1-A5E3-FCAC1E37303D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F3CFA6D-3142-4616-8A46-F05C7BBF1EC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F3CFA6D-3142-4616-8A46-F05C7BBF1EC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F3CFA6D-3142-4616-8A46-F05C7BBF1EC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F3CFA6D-3142-4616-8A46-F05C7BBF1EC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D835A0A8-C213-461F-8B41-6F2715DBEC43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D835A0A8-C213-461F-8B41-6F2715DBEC43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D835A0A8-C213-461F-8B41-6F2715DBEC43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D835A0A8-C213-461F-8B41-6F2715DBEC43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECF14067-8633-4DDA-8EAE-124989F8E09E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECF14067-8633-4DDA-8EAE-124989F8E09E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECF14067-8633-4DDA-8EAE-124989F8E09E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECF14067-8633-4DDA-8EAE-124989F8E09E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57AF678A-3671-4B9E-9608-053E2197D0A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57AF678A-3671-4B9E-9608-053E2197D0A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57AF678A-3671-4B9E-9608-053E2197D0A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57AF678A-3671-4B9E-9608-053E2197D0A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A77E804D-4576-4962-A248-92E538ED997C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A77E804D-4576-4962-A248-92E538ED997C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A77E804D-4576-4962-A248-92E538ED997C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A77E804D-4576-4962-A248-92E538ED997C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CE53C256-EE31-4E4A-8A05-70350840448F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CE53C256-EE31-4E4A-8A05-70350840448F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CE53C256-EE31-4E4A-8A05-70350840448F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -107,6 +151,14 @@ Global
 		{1D851FA7-2F3C-4E3C-8F22-AF5E13D9BEE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D851FA7-2F3C-4E3C-8F22-AF5E13D9BEE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1D851FA7-2F3C-4E3C-8F22-AF5E13D9BEE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA790584-200C-4301-8545-8B2854B2F6CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA790584-200C-4301-8545-8B2854B2F6CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA790584-200C-4301-8545-8B2854B2F6CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA790584-200C-4301-8545-8B2854B2F6CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40525D17-4553-405E-8B21-4603B07D126A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40525D17-4553-405E-8B21-4603B07D126A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40525D17-4553-405E-8B21-4603B07D126A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40525D17-4553-405E-8B21-4603B07D126A}.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
@@ -119,6 +171,34 @@ Global
 		{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
+		{F2C0D619-8CAF-4F81-B681-3F75AF79661F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2C0D619-8CAF-4F81-B681-3F75AF79661F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2C0D619-8CAF-4F81-B681-3F75AF79661F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2C0D619-8CAF-4F81-B681-3F75AF79661F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2853038-B04A-4BAA-B0B4-0481457003B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2853038-B04A-4BAA-B0B4-0481457003B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2853038-B04A-4BAA-B0B4-0481457003B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2853038-B04A-4BAA-B0B4-0481457003B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14375EFA-3F3D-4D48-8C83-56356BCF8DB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14375EFA-3F3D-4D48-8C83-56356BCF8DB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14375EFA-3F3D-4D48-8C83-56356BCF8DB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14375EFA-3F3D-4D48-8C83-56356BCF8DB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DBAB1C82-A3A0-4ADC-95BC-B87557C61C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBAB1C82-A3A0-4ADC-95BC-B87557C61C42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBAB1C82-A3A0-4ADC-95BC-B87557C61C42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBAB1C82-A3A0-4ADC-95BC-B87557C61C42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B233AB55-788C-48B6-9557-098B8D0DDBFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B233AB55-788C-48B6-9557-098B8D0DDBFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B233AB55-788C-48B6-9557-098B8D0DDBFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B233AB55-788C-48B6-9557-098B8D0DDBFF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BB43905-3DBD-47E4-A38F-2BE319300B15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BB43905-3DBD-47E4-A38F-2BE319300B15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BB43905-3DBD-47E4-A38F-2BE319300B15}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BB43905-3DBD-47E4-A38F-2BE319300B15}.Release|Any CPU.Build.0 = Release|Any CPU
+		{711B2905-FDC7-4D67-B40B-9DEFF042CB01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{711B2905-FDC7-4D67-B40B-9DEFF042CB01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{711B2905-FDC7-4D67-B40B-9DEFF042CB01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{711B2905-FDC7-4D67-B40B-9DEFF042CB01}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F452AA57-7BEC-4E64-BAB5-166078865EC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F452AA57-7BEC-4E64-BAB5-166078865EC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F452AA57-7BEC-4E64-BAB5-166078865EC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -143,102 +223,71 @@ Global
 		{3D040E9F-C39B-49C6-8C87-68D427AECA8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3D040E9F-C39B-49C6-8C87-68D427AECA8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D040E9F-C39B-49C6-8C87-68D427AECA8F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA790584-200C-4301-8545-8B2854B2F6CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA790584-200C-4301-8545-8B2854B2F6CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA790584-200C-4301-8545-8B2854B2F6CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA790584-200C-4301-8545-8B2854B2F6CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40525D17-4553-405E-8B21-4603B07D126A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40525D17-4553-405E-8B21-4603B07D126A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40525D17-4553-405E-8B21-4603B07D126A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40525D17-4553-405E-8B21-4603B07D126A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D529E61-474E-45C6-8A7E-35AAD70B9801}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D529E61-474E-45C6-8A7E-35AAD70B9801}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D529E61-474E-45C6-8A7E-35AAD70B9801}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D529E61-474E-45C6-8A7E-35AAD70B9801}.Release|Any CPU.Build.0 = Release|Any CPU
-		{30E93D8B-4B53-4DC1-A5E3-FCAC1E37303D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30E93D8B-4B53-4DC1-A5E3-FCAC1E37303D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30E93D8B-4B53-4DC1-A5E3-FCAC1E37303D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{30E93D8B-4B53-4DC1-A5E3-FCAC1E37303D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2DC4F9C2-7C2B-4B8C-9AB3-74F3F06D359B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2DC4F9C2-7C2B-4B8C-9AB3-74F3F06D359B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DC4F9C2-7C2B-4B8C-9AB3-74F3F06D359B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2DC4F9C2-7C2B-4B8C-9AB3-74F3F06D359B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2853038-B04A-4BAA-B0B4-0481457003B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2853038-B04A-4BAA-B0B4-0481457003B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2853038-B04A-4BAA-B0B4-0481457003B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2853038-B04A-4BAA-B0B4-0481457003B8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A77E804D-4576-4962-A248-92E538ED997C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A77E804D-4576-4962-A248-92E538ED997C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A77E804D-4576-4962-A248-92E538ED997C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A77E804D-4576-4962-A248-92E538ED997C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DBAB1C82-A3A0-4ADC-95BC-B87557C61C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBAB1C82-A3A0-4ADC-95BC-B87557C61C42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBAB1C82-A3A0-4ADC-95BC-B87557C61C42}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DBAB1C82-A3A0-4ADC-95BC-B87557C61C42}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6BB43905-3DBD-47E4-A38F-2BE319300B15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6BB43905-3DBD-47E4-A38F-2BE319300B15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6BB43905-3DBD-47E4-A38F-2BE319300B15}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6BB43905-3DBD-47E4-A38F-2BE319300B15}.Release|Any CPU.Build.0 = Release|Any CPU
-		{711B2905-FDC7-4D67-B40B-9DEFF042CB01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{711B2905-FDC7-4D67-B40B-9DEFF042CB01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{711B2905-FDC7-4D67-B40B-9DEFF042CB01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{711B2905-FDC7-4D67-B40B-9DEFF042CB01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B233AB55-788C-48B6-9557-098B8D0DDBFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B233AB55-788C-48B6-9557-098B8D0DDBFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B233AB55-788C-48B6-9557-098B8D0DDBFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B233AB55-788C-48B6-9557-098B8D0DDBFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ECF14067-8633-4DDA-8EAE-124989F8E09E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECF14067-8633-4DDA-8EAE-124989F8E09E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECF14067-8633-4DDA-8EAE-124989F8E09E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ECF14067-8633-4DDA-8EAE-124989F8E09E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D835A0A8-C213-461F-8B41-6F2715DBEC43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D835A0A8-C213-461F-8B41-6F2715DBEC43}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D835A0A8-C213-461F-8B41-6F2715DBEC43}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D835A0A8-C213-461F-8B41-6F2715DBEC43}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F2C0D619-8CAF-4F81-B681-3F75AF79661F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2C0D619-8CAF-4F81-B681-3F75AF79661F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2C0D619-8CAF-4F81-B681-3F75AF79661F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F2C0D619-8CAF-4F81-B681-3F75AF79661F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{57AF678A-3671-4B9E-9608-053E2197D0A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57AF678A-3671-4B9E-9608-053E2197D0A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57AF678A-3671-4B9E-9608-053E2197D0A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57AF678A-3671-4B9E-9608-053E2197D0A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AA24760-2385-4BFA-B32C-9AF2BCE647AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AA24760-2385-4BFA-B32C-9AF2BCE647AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AA24760-2385-4BFA-B32C-9AF2BCE647AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AA24760-2385-4BFA-B32C-9AF2BCE647AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62124842-8535-4697-896E-1D3177F8D501}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62124842-8535-4697-896E-1D3177F8D501}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62124842-8535-4697-896E-1D3177F8D501}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62124842-8535-4697-896E-1D3177F8D501}.Release|Any CPU.Build.0 = Release|Any CPU
+		{852F0BAC-D11B-4A19-B1CC-1EED41C7AA22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{852F0BAC-D11B-4A19-B1CC-1EED41C7AA22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{852F0BAC-D11B-4A19-B1CC-1EED41C7AA22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{852F0BAC-D11B-4A19-B1CC-1EED41C7AA22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{063D2ABE-3766-42D4-9C3C-0C6B78C7D744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{063D2ABE-3766-42D4-9C3C-0C6B78C7D744}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{063D2ABE-3766-42D4-9C3C-0C6B78C7D744}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{063D2ABE-3766-42D4-9C3C-0C6B78C7D744}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A80CEDD-891C-4867-9AD1-4A1734DBD34F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A80CEDD-891C-4867-9AD1-4A1734DBD34F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A80CEDD-891C-4867-9AD1-4A1734DBD34F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A80CEDD-891C-4867-9AD1-4A1734DBD34F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{B6663ACE-6FE4-4BB4-8B35-AB98EF62EAAE} = {76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3}
+		{43DBAD84-A865-4F5F-AB76-7F3EB6784E99} = {76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3}
 		{E7A3B914-598D-4ABC-B973-6CC444DAFE52} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
-		{280FDDEA-50B1-4BD3-83B1-475B15829538} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
+		{2D529E61-474E-45C6-8A7E-35AAD70B9801} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
+		{D835A0A8-C213-461F-8B41-6F2715DBEC43} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
+		{57AF678A-3671-4B9E-9608-053E2197D0A4} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
 		{CE53C256-EE31-4E4A-8A05-70350840448F} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
-		{3B8833A4-2E9E-47BD-93DE-65934DCEB9A6} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
 		{C175A982-E0E0-4E22-8A3B-0A9C00EE7730} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
-		{1D851FA7-2F3C-4E3C-8F22-AF5E13D9BEE6} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
+		{AA790584-200C-4301-8545-8B2854B2F6CC} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
 		{EF75497C-6CB7-4471-980A-619EA1AB8CF6} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
-		{09E28D94-B771-48EB-800C-5A80C2C0055C} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
-		{43DBAD84-A865-4F5F-AB76-7F3EB6784E99} = {76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3}
+		{F2C0D619-8CAF-4F81-B681-3F75AF79661F} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
+		{DBAB1C82-A3A0-4ADC-95BC-B87557C61C42} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
+		{6BB43905-3DBD-47E4-A38F-2BE319300B15} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
 		{F452AA57-7BEC-4E64-BAB5-166078865EC4} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
-		{AE5566CE-EC5E-47B0-B5A3-89E90B3893F0} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
-		{ED105ED3-0060-4035-AD5E-1F857F94C2DF} = {66953A8A-9E31-486F-AF8E-7310F6707E4F}
-		{0A0D7CB1-3864-478F-98FC-5AA53C6A72C2} = {66953A8A-9E31-486F-AF8E-7310F6707E4F}
-		{3FEA305D-0B5F-46A6-8E18-587387FCBFBF} = {66953A8A-9E31-486F-AF8E-7310F6707E4F}
 		{3D040E9F-C39B-49C6-8C87-68D427AECA8F} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
-		{AA790584-200C-4301-8545-8B2854B2F6CC} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
-		{40525D17-4553-405E-8B21-4603B07D126A} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
-		{2D529E61-474E-45C6-8A7E-35AAD70B9801} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
+		{280FDDEA-50B1-4BD3-83B1-475B15829538} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
 		{30E93D8B-4B53-4DC1-A5E3-FCAC1E37303D} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
-		{2DC4F9C2-7C2B-4B8C-9AB3-74F3F06D359B} = {76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3}
-		{A2853038-B04A-4BAA-B0B4-0481457003B8} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
+		{ECF14067-8633-4DDA-8EAE-124989F8E09E} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
 		{A77E804D-4576-4962-A248-92E538ED997C} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
-		{DBAB1C82-A3A0-4ADC-95BC-B87557C61C42} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
-		{6BB43905-3DBD-47E4-A38F-2BE319300B15} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
-		{711B2905-FDC7-4D67-B40B-9DEFF042CB01} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
+		{3B8833A4-2E9E-47BD-93DE-65934DCEB9A6} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
+		{1D851FA7-2F3C-4E3C-8F22-AF5E13D9BEE6} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
+		{40525D17-4553-405E-8B21-4603B07D126A} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
+		{09E28D94-B771-48EB-800C-5A80C2C0055C} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
+		{A2853038-B04A-4BAA-B0B4-0481457003B8} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
 		{B233AB55-788C-48B6-9557-098B8D0DDBFF} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
-		{ECF14067-8633-4DDA-8EAE-124989F8E09E} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
-		{D835A0A8-C213-461F-8B41-6F2715DBEC43} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
-		{F2C0D619-8CAF-4F81-B681-3F75AF79661F} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
-		{57AF678A-3671-4B9E-9608-053E2197D0A4} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
+		{711B2905-FDC7-4D67-B40B-9DEFF042CB01} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
+		{AE5566CE-EC5E-47B0-B5A3-89E90B3893F0} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
+		{1F3CFA6D-3142-4616-8A46-F05C7BBF1EC6} = {66953A8A-9E31-486F-AF8E-7310F6707E4F}
+		{14375EFA-3F3D-4D48-8C83-56356BCF8DB3} = {66953A8A-9E31-486F-AF8E-7310F6707E4F}
+		{ED105ED3-0060-4035-AD5E-1F857F94C2DF} = {66953A8A-9E31-486F-AF8E-7310F6707E4F}
+		{0A0D7CB1-3864-478F-98FC-5AA53C6A72C2} = {66953A8A-9E31-486F-AF8E-7310F6707E4F}
+		{3FEA305D-0B5F-46A6-8E18-587387FCBFBF} = {66953A8A-9E31-486F-AF8E-7310F6707E4F}
+		{5AA24760-2385-4BFA-B32C-9AF2BCE647AB} = {C3E784CB-8296-4960-B679-9A5D3153D5B5}
+		{62124842-8535-4697-896E-1D3177F8D501} = {C3E784CB-8296-4960-B679-9A5D3153D5B5}
+		{C3E784CB-8296-4960-B679-9A5D3153D5B5} = {BAA0DDCC-9BB2-4535-9DE8-6B2DE3E7F65F}
+		{852F0BAC-D11B-4A19-B1CC-1EED41C7AA22} = {0D3332C5-9EE4-4051-BD99-EEC2036C3E80}
+		{063D2ABE-3766-42D4-9C3C-0C6B78C7D744} = {0D3332C5-9EE4-4051-BD99-EEC2036C3E80}
+		{0D3332C5-9EE4-4051-BD99-EEC2036C3E80} = {BAA0DDCC-9BB2-4535-9DE8-6B2DE3E7F65F}
+		{3A80CEDD-891C-4867-9AD1-4A1734DBD34F} = {F30454AC-DA27-4412-BFC2-C43498B6B304}
+		{F30454AC-DA27-4412-BFC2-C43498B6B304} = {BAA0DDCC-9BB2-4535-9DE8-6B2DE3E7F65F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7D279EE5-E38F-4125-AE82-6ADE52D72F26}
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 3904fbb3cc3f0..973340798318f 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
@@ -7,18 +7,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{E7FEEB55-F4A7-4677-AFD5-7DE90A4897AE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{A138F8C7-DBF9-43D8-993D-D8B8609FAE2B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{D84E4D42-84EA-41B1-A689-00E964FED8DD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{4F62F683-8B2A-46EE-BC34-5CC192DE0C32}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{9CC188A7-707F-4B20-8B78-D66CC06BDA6B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{3E5B825A-F1D4-4068-B9A2-B3871E5DE574}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{68DD4E47-0A1E-46E0-BECB-CFBF26358D79}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{6C5C35AC-875D-44AB-AD37-080742F5B9E9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{C914EBC9-0C74-4163-ABCE-70DC5C976706}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BE15F96C-8AA4-4F7D-9A69-9924531A6136}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D948D4F3-4232-4FEA-936D-5F554D335FEA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{1EB544B8-7931-492C-BB70-82C96C195BCD}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{5BC2401B-E368-4524-85B1-5A6E2B80BB01}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{CEEC0CF7-E2D1-4AB5-B774-8E9780E7EA71}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{0FAD4E08-F95B-491E-B7F6-C951C5365F74}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{B1A7794E-65A0-427A-9D3B-5754217793AC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +57,6 @@ Global
 		{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
-		{A138F8C7-DBF9-43D8-993D-D8B8609FAE2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A138F8C7-DBF9-43D8-993D-D8B8609FAE2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A138F8C7-DBF9-43D8-993D-D8B8609FAE2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A138F8C7-DBF9-43D8-993D-D8B8609FAE2B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D84E4D42-84EA-41B1-A689-00E964FED8DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D84E4D42-84EA-41B1-A689-00E964FED8DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D84E4D42-84EA-41B1-A689-00E964FED8DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -53,6 +65,26 @@ Global
 		{4F62F683-8B2A-46EE-BC34-5CC192DE0C32}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4F62F683-8B2A-46EE-BC34-5CC192DE0C32}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4F62F683-8B2A-46EE-BC34-5CC192DE0C32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CC188A7-707F-4B20-8B78-D66CC06BDA6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CC188A7-707F-4B20-8B78-D66CC06BDA6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CC188A7-707F-4B20-8B78-D66CC06BDA6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CC188A7-707F-4B20-8B78-D66CC06BDA6B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E5B825A-F1D4-4068-B9A2-B3871E5DE574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E5B825A-F1D4-4068-B9A2-B3871E5DE574}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E5B825A-F1D4-4068-B9A2-B3871E5DE574}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E5B825A-F1D4-4068-B9A2-B3871E5DE574}.Release|Any CPU.Build.0 = Release|Any CPU
+		{68DD4E47-0A1E-46E0-BECB-CFBF26358D79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68DD4E47-0A1E-46E0-BECB-CFBF26358D79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68DD4E47-0A1E-46E0-BECB-CFBF26358D79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{68DD4E47-0A1E-46E0-BECB-CFBF26358D79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C5C35AC-875D-44AB-AD37-080742F5B9E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C5C35AC-875D-44AB-AD37-080742F5B9E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C5C35AC-875D-44AB-AD37-080742F5B9E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C5C35AC-875D-44AB-AD37-080742F5B9E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C914EBC9-0C74-4163-ABCE-70DC5C976706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C914EBC9-0C74-4163-ABCE-70DC5C976706}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C914EBC9-0C74-4163-ABCE-70DC5C976706}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C914EBC9-0C74-4163-ABCE-70DC5C976706}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -62,9 +94,16 @@ Global
 		{F985DC40-F983-4464-B866-3BD17EE3B6B1} = {BE15F96C-8AA4-4F7D-9A69-9924531A6136}
 		{DD99D42D-60FD-45D8-9F55-BE3AE38626D0} = {D948D4F3-4232-4FEA-936D-5F554D335FEA}
 		{E7FEEB55-F4A7-4677-AFD5-7DE90A4897AE} = {D948D4F3-4232-4FEA-936D-5F554D335FEA}
-		{A138F8C7-DBF9-43D8-993D-D8B8609FAE2B} = {1EB544B8-7931-492C-BB70-82C96C195BCD}
 		{D84E4D42-84EA-41B1-A689-00E964FED8DD} = {1EB544B8-7931-492C-BB70-82C96C195BCD}
 		{4F62F683-8B2A-46EE-BC34-5CC192DE0C32} = {1EB544B8-7931-492C-BB70-82C96C195BCD}
+		{9CC188A7-707F-4B20-8B78-D66CC06BDA6B} = {5BC2401B-E368-4524-85B1-5A6E2B80BB01}
+		{3E5B825A-F1D4-4068-B9A2-B3871E5DE574} = {5BC2401B-E368-4524-85B1-5A6E2B80BB01}
+		{5BC2401B-E368-4524-85B1-5A6E2B80BB01} = {B1A7794E-65A0-427A-9D3B-5754217793AC}
+		{68DD4E47-0A1E-46E0-BECB-CFBF26358D79} = {CEEC0CF7-E2D1-4AB5-B774-8E9780E7EA71}
+		{6C5C35AC-875D-44AB-AD37-080742F5B9E9} = {CEEC0CF7-E2D1-4AB5-B774-8E9780E7EA71}
+		{CEEC0CF7-E2D1-4AB5-B774-8E9780E7EA71} = {B1A7794E-65A0-427A-9D3B-5754217793AC}
+		{C914EBC9-0C74-4163-ABCE-70DC5C976706} = {0FAD4E08-F95B-491E-B7F6-C951C5365F74}
+		{0FAD4E08-F95B-491E-B7F6-C951C5365F74} = {B1A7794E-65A0-427A-9D3B-5754217793AC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {ADEB1F74-B672-4B9F-A221-7A548028621F}
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 0c7e2bc7fef20..08c8ed1d5dccc 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
@@ -15,12 +15,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{FC76C7E7-C2C3-43D0-99AE-C77E8402FBE3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{2E4B702C-0850-4030-BC13-8C36F9171B93}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{79F0E6DD-E665-4CAD-9C1D-D3570DBDA5FB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9FA8F495-A781-4D1E-8793-EB08E862AA37}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{03B4234A-E0E5-41E8-9477-DD6BC1062931}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{CAC0C5B3-60CC-4F10-8BEC-DD9AE08F8A87}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{A77B5D0D-74E0-4EF4-AA41-60910A5ACC26}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{4B88EE77-3CC0-46F7-9F1F-113EE59B9B11}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{33CB0531-474C-4419-B49A-1550854FB27C}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3237C857-6C3B-42C4-83B1-7AE4B4C74021}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C329135D-8725-4ABA-A2AE-63F51114EAF5}"
@@ -29,6 +37,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{998B15B4-464
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{94912E31-E514-4648-BD9F-3259A8116AC0}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{B6DA6974-633C-47A5-BE72-16549D0FBE8A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{3CF434A0-5238-4AAC-BD4D-74A78F634CE7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{09E5A07D-B2F6-4690-9BC9-26D94B860D43}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{62343EA1-8A9C-43B2-86BC-F6922BCFFAC7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,10 +83,6 @@ Global
 		{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
-		{2E4B702C-0850-4030-BC13-8C36F9171B93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E4B702C-0850-4030-BC13-8C36F9171B93}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E4B702C-0850-4030-BC13-8C36F9171B93}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E4B702C-0850-4030-BC13-8C36F9171B93}.Release|Any CPU.Build.0 = Release|Any CPU
 		{79F0E6DD-E665-4CAD-9C1D-D3570DBDA5FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{79F0E6DD-E665-4CAD-9C1D-D3570DBDA5FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{79F0E6DD-E665-4CAD-9C1D-D3570DBDA5FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -79,6 +91,26 @@ Global
 		{9FA8F495-A781-4D1E-8793-EB08E862AA37}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9FA8F495-A781-4D1E-8793-EB08E862AA37}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9FA8F495-A781-4D1E-8793-EB08E862AA37}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03B4234A-E0E5-41E8-9477-DD6BC1062931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03B4234A-E0E5-41E8-9477-DD6BC1062931}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03B4234A-E0E5-41E8-9477-DD6BC1062931}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03B4234A-E0E5-41E8-9477-DD6BC1062931}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAC0C5B3-60CC-4F10-8BEC-DD9AE08F8A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAC0C5B3-60CC-4F10-8BEC-DD9AE08F8A87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAC0C5B3-60CC-4F10-8BEC-DD9AE08F8A87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAC0C5B3-60CC-4F10-8BEC-DD9AE08F8A87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A77B5D0D-74E0-4EF4-AA41-60910A5ACC26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A77B5D0D-74E0-4EF4-AA41-60910A5ACC26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A77B5D0D-74E0-4EF4-AA41-60910A5ACC26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A77B5D0D-74E0-4EF4-AA41-60910A5ACC26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B88EE77-3CC0-46F7-9F1F-113EE59B9B11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B88EE77-3CC0-46F7-9F1F-113EE59B9B11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B88EE77-3CC0-46F7-9F1F-113EE59B9B11}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B88EE77-3CC0-46F7-9F1F-113EE59B9B11}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33CB0531-474C-4419-B49A-1550854FB27C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33CB0531-474C-4419-B49A-1550854FB27C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33CB0531-474C-4419-B49A-1550854FB27C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33CB0531-474C-4419-B49A-1550854FB27C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -92,9 +124,16 @@ Global
 		{4A904B1E-5710-4D31-A734-33C734C9D989} = {998B15B4-464F-40EB-92DA-61637BE9C838}
 		{7A8F66B3-8D37-4D83-B54F-0955EC11F675} = {998B15B4-464F-40EB-92DA-61637BE9C838}
 		{FC76C7E7-C2C3-43D0-99AE-C77E8402FBE3} = {998B15B4-464F-40EB-92DA-61637BE9C838}
-		{2E4B702C-0850-4030-BC13-8C36F9171B93} = {94912E31-E514-4648-BD9F-3259A8116AC0}
 		{79F0E6DD-E665-4CAD-9C1D-D3570DBDA5FB} = {94912E31-E514-4648-BD9F-3259A8116AC0}
 		{9FA8F495-A781-4D1E-8793-EB08E862AA37} = {94912E31-E514-4648-BD9F-3259A8116AC0}
+		{03B4234A-E0E5-41E8-9477-DD6BC1062931} = {B6DA6974-633C-47A5-BE72-16549D0FBE8A}
+		{CAC0C5B3-60CC-4F10-8BEC-DD9AE08F8A87} = {B6DA6974-633C-47A5-BE72-16549D0FBE8A}
+		{B6DA6974-633C-47A5-BE72-16549D0FBE8A} = {62343EA1-8A9C-43B2-86BC-F6922BCFFAC7}
+		{A77B5D0D-74E0-4EF4-AA41-60910A5ACC26} = {3CF434A0-5238-4AAC-BD4D-74A78F634CE7}
+		{4B88EE77-3CC0-46F7-9F1F-113EE59B9B11} = {3CF434A0-5238-4AAC-BD4D-74A78F634CE7}
+		{3CF434A0-5238-4AAC-BD4D-74A78F634CE7} = {62343EA1-8A9C-43B2-86BC-F6922BCFFAC7}
+		{33CB0531-474C-4419-B49A-1550854FB27C} = {09E5A07D-B2F6-4690-9BC9-26D94B860D43}
+		{09E5A07D-B2F6-4690-9BC9-26D94B860D43} = {62343EA1-8A9C-43B2-86BC-F6922BCFFAC7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2C4F880D-DD85-46A9-881C-94C75D87D8A9}
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 d5052afde1c48..ba5b87033f3f7 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
@@ -19,12 +19,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{C55245FA-CAA6-43F7-917C-602E97BC8D52}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{BC01147D-7462-4367-A2BA-E00A54A76D6E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{9ECEF693-0104-4829-85E6-9CC81A8A0FA1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{FE431CFB-8AC4-4118-95D7-7EBE1722CB66}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{95F48786-2334-4200-8B52-E1CA9A2F365F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{51E5638C-7F4A-427E-A65A-2D768C2A5926}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{A07F79B0-BD41-4552-861D-A247F4A2ECAF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{B8816CC2-4B2D-4BF5-BEA8-CB7FEA7A94DC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{C6AD925F-E5B1-4E80-8569-F5CFE0CA7347}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{19152DEB-C902-49AF-A864-27D7E18B3DD1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{496923C9-6CEE-4E94-A711-4CA3D99FB074}"
@@ -33,6 +41,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7DDADA4C-8D2
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{4A7AB018-13B5-44F7-BFF2-AE38E425BDD2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{A1651C23-E749-42FE-89F6-890C8849E730}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{125A217E-565D-4561-8712-AA5199C628C4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{50C7BFD1-1EBE-4540-8A64-4FAFEAD689F0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{059996EB-6B80-4F8D-93B1-F8B48364FF39}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,10 +95,6 @@ Global
 		{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
-		{BC01147D-7462-4367-A2BA-E00A54A76D6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC01147D-7462-4367-A2BA-E00A54A76D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC01147D-7462-4367-A2BA-E00A54A76D6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC01147D-7462-4367-A2BA-E00A54A76D6E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9ECEF693-0104-4829-85E6-9CC81A8A0FA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9ECEF693-0104-4829-85E6-9CC81A8A0FA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9ECEF693-0104-4829-85E6-9CC81A8A0FA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -91,6 +103,26 @@ Global
 		{FE431CFB-8AC4-4118-95D7-7EBE1722CB66}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FE431CFB-8AC4-4118-95D7-7EBE1722CB66}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE431CFB-8AC4-4118-95D7-7EBE1722CB66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{95F48786-2334-4200-8B52-E1CA9A2F365F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95F48786-2334-4200-8B52-E1CA9A2F365F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95F48786-2334-4200-8B52-E1CA9A2F365F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95F48786-2334-4200-8B52-E1CA9A2F365F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51E5638C-7F4A-427E-A65A-2D768C2A5926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51E5638C-7F4A-427E-A65A-2D768C2A5926}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51E5638C-7F4A-427E-A65A-2D768C2A5926}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51E5638C-7F4A-427E-A65A-2D768C2A5926}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A07F79B0-BD41-4552-861D-A247F4A2ECAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A07F79B0-BD41-4552-861D-A247F4A2ECAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A07F79B0-BD41-4552-861D-A247F4A2ECAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A07F79B0-BD41-4552-861D-A247F4A2ECAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8816CC2-4B2D-4BF5-BEA8-CB7FEA7A94DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8816CC2-4B2D-4BF5-BEA8-CB7FEA7A94DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8816CC2-4B2D-4BF5-BEA8-CB7FEA7A94DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8816CC2-4B2D-4BF5-BEA8-CB7FEA7A94DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6AD925F-E5B1-4E80-8569-F5CFE0CA7347}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6AD925F-E5B1-4E80-8569-F5CFE0CA7347}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6AD925F-E5B1-4E80-8569-F5CFE0CA7347}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6AD925F-E5B1-4E80-8569-F5CFE0CA7347}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -106,9 +138,16 @@ Global
 		{55A66A71-A400-4A36-9A19-9F8B549647D7} = {7DDADA4C-8D27-4582-93DD-ABE98D76B3FF}
 		{DBE052B4-23A7-4F40-BFFE-9604E39AAACF} = {7DDADA4C-8D27-4582-93DD-ABE98D76B3FF}
 		{C55245FA-CAA6-43F7-917C-602E97BC8D52} = {7DDADA4C-8D27-4582-93DD-ABE98D76B3FF}
-		{BC01147D-7462-4367-A2BA-E00A54A76D6E} = {4A7AB018-13B5-44F7-BFF2-AE38E425BDD2}
 		{9ECEF693-0104-4829-85E6-9CC81A8A0FA1} = {4A7AB018-13B5-44F7-BFF2-AE38E425BDD2}
 		{FE431CFB-8AC4-4118-95D7-7EBE1722CB66} = {4A7AB018-13B5-44F7-BFF2-AE38E425BDD2}
+		{95F48786-2334-4200-8B52-E1CA9A2F365F} = {A1651C23-E749-42FE-89F6-890C8849E730}
+		{51E5638C-7F4A-427E-A65A-2D768C2A5926} = {A1651C23-E749-42FE-89F6-890C8849E730}
+		{A1651C23-E749-42FE-89F6-890C8849E730} = {059996EB-6B80-4F8D-93B1-F8B48364FF39}
+		{A07F79B0-BD41-4552-861D-A247F4A2ECAF} = {125A217E-565D-4561-8712-AA5199C628C4}
+		{B8816CC2-4B2D-4BF5-BEA8-CB7FEA7A94DC} = {125A217E-565D-4561-8712-AA5199C628C4}
+		{125A217E-565D-4561-8712-AA5199C628C4} = {059996EB-6B80-4F8D-93B1-F8B48364FF39}
+		{C6AD925F-E5B1-4E80-8569-F5CFE0CA7347} = {50C7BFD1-1EBE-4540-8A64-4FAFEAD689F0}
+		{50C7BFD1-1EBE-4540-8A64-4FAFEAD689F0} = {059996EB-6B80-4F8D-93B1-F8B48364FF39}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4B425DE1-F167-465F-97A1-FA1E8C63DFB8}
diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln
index 24b2e3db06143..e506a20631332 100644
--- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln
+++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln
@@ -7,12 +7,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSy
 EndProject
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{6AD7132C-D2D1-4F7E-8382-DB608F9F8781}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{7A85F84A-4E74-471D-8F9C-3D06D5D8BD74}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{404A8198-B2DF-42AB-BA33-69509A8E0C91}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{41434677-8D75-4375-A24C-D9A1004FB758}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{D50F036B-C776-4C6D-BAC8-53F7F0D13CBD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{272E2AC2-D943-4A3B-BA7C-002C726F30AE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{6BB6EE1A-A9B2-4EA4-99CC-673E6FDF3AF1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{1EBD4A59-F3D2-4B06-8D80-2E6935F7D0D4}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7438714C-BB16-491E-8D9C-A2B7CB0EFA35}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4A9C0071-CAD0-4ABB-A489-04280BA258A5}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AE2C386A-473
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2EF45468-C4F8-4194-9720-592D0186B585}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{E75B0897-7E50-4614-8AF0-FEFD894ADD53}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{2AC2257A-CF0F-4352-88B3-AA442186BDDD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{78FAE809-8C32-4C9B-AEF1-FF2655E2B7D6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{C76FCB88-D877-440A-94D7-DF3016705AA2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{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
-		{6AD7132C-D2D1-4F7E-8382-DB608F9F8781}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6AD7132C-D2D1-4F7E-8382-DB608F9F8781}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6AD7132C-D2D1-4F7E-8382-DB608F9F8781}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6AD7132C-D2D1-4F7E-8382-DB608F9F8781}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7A85F84A-4E74-471D-8F9C-3D06D5D8BD74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7A85F84A-4E74-471D-8F9C-3D06D5D8BD74}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7A85F84A-4E74-471D-8F9C-3D06D5D8BD74}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{404A8198-B2DF-42AB-BA33-69509A8E0C91}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{404A8198-B2DF-42AB-BA33-69509A8E0C91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{404A8198-B2DF-42AB-BA33-69509A8E0C91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41434677-8D75-4375-A24C-D9A1004FB758}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41434677-8D75-4375-A24C-D9A1004FB758}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41434677-8D75-4375-A24C-D9A1004FB758}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41434677-8D75-4375-A24C-D9A1004FB758}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D50F036B-C776-4C6D-BAC8-53F7F0D13CBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D50F036B-C776-4C6D-BAC8-53F7F0D13CBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D50F036B-C776-4C6D-BAC8-53F7F0D13CBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D50F036B-C776-4C6D-BAC8-53F7F0D13CBD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{272E2AC2-D943-4A3B-BA7C-002C726F30AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{272E2AC2-D943-4A3B-BA7C-002C726F30AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{272E2AC2-D943-4A3B-BA7C-002C726F30AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{272E2AC2-D943-4A3B-BA7C-002C726F30AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BB6EE1A-A9B2-4EA4-99CC-673E6FDF3AF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BB6EE1A-A9B2-4EA4-99CC-673E6FDF3AF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BB6EE1A-A9B2-4EA4-99CC-673E6FDF3AF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BB6EE1A-A9B2-4EA4-99CC-673E6FDF3AF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EBD4A59-F3D2-4B06-8D80-2E6935F7D0D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EBD4A59-F3D2-4B06-8D80-2E6935F7D0D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EBD4A59-F3D2-4B06-8D80-2E6935F7D0D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1EBD4A59-F3D2-4B06-8D80-2E6935F7D0D4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,9 +96,16 @@ Global
 		{79B284F9-326E-4FEB-9A32-EA72A31B4B60} = {7438714C-BB16-491E-8D9C-A2B7CB0EFA35}
 		{ECFF7A87-0D5F-4EA1-9FED-1126A51B5D55} = {4A9C0071-CAD0-4ABB-A489-04280BA258A5}
 		{A9547748-8B4F-450E-B0E3-CD9A1A80B319} = {AE2C386A-473E-46FF-97DB-4CB1727122BB}
-		{6AD7132C-D2D1-4F7E-8382-DB608F9F8781} = {2EF45468-C4F8-4194-9720-592D0186B585}
 		{7A85F84A-4E74-471D-8F9C-3D06D5D8BD74} = {2EF45468-C4F8-4194-9720-592D0186B585}
 		{404A8198-B2DF-42AB-BA33-69509A8E0C91} = {2EF45468-C4F8-4194-9720-592D0186B585}
+		{41434677-8D75-4375-A24C-D9A1004FB758} = {E75B0897-7E50-4614-8AF0-FEFD894ADD53}
+		{D50F036B-C776-4C6D-BAC8-53F7F0D13CBD} = {E75B0897-7E50-4614-8AF0-FEFD894ADD53}
+		{E75B0897-7E50-4614-8AF0-FEFD894ADD53} = {C76FCB88-D877-440A-94D7-DF3016705AA2}
+		{272E2AC2-D943-4A3B-BA7C-002C726F30AE} = {2AC2257A-CF0F-4352-88B3-AA442186BDDD}
+		{6BB6EE1A-A9B2-4EA4-99CC-673E6FDF3AF1} = {2AC2257A-CF0F-4352-88B3-AA442186BDDD}
+		{2AC2257A-CF0F-4352-88B3-AA442186BDDD} = {C76FCB88-D877-440A-94D7-DF3016705AA2}
+		{1EBD4A59-F3D2-4B06-8D80-2E6935F7D0D4} = {78FAE809-8C32-4C9B-AEF1-FF2655E2B7D6}
+		{78FAE809-8C32-4C9B-AEF1-FF2655E2B7D6} = {C76FCB88-D877-440A-94D7-DF3016705AA2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4FA3B475-4D82-4A80-8625-D5C98B8FF794}
diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/Microsoft.Extensions.HostFactoryResolver.sln b/src/libraries/Microsoft.Extensions.HostFactoryResolver/Microsoft.Extensions.HostFactoryResolver.sln
index 538754e057c3d..11fcaf752a369 100644
--- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/Microsoft.Extensions.HostFactoryResolver.sln
+++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/Microsoft.Extensions.HostFactoryResolver.sln
@@ -47,6 +47,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{0B776D27-DC71-432D-AC41-7BCDA6F2001D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\ref\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{BDD4F886-F31A-4A54-8D09-352364BD1A11}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\src\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{E448C7D4-D00F-4663-9D5B-C90F3C746617}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\ref\Microsoft.Extensions.Diagnostics.csproj", "{C4040013-E2E5-4D9D-B076-BC0A1B833D01}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\src\Microsoft.Extensions.Diagnostics.csproj", "{6D9E9140-E7EA-4BE2-84A8-AC5E3791D8EB}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{F07F74E4-0F9E-41B4-924C-380E1DF698E2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{A44460E9-1ADD-4059-966B-677F6971FB5D}"
@@ -141,6 +149,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Option
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{4B4E38AB-2BB4-4958-A791-440252601444}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{14313E39-4A4C-405A-BF84-849A09DF3F09}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{7E258A29-16B0-4C3A-B822-2E94BEC6B7AD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{3BAC864E-1F70-48B1-A7B3-C46DD997D9EA}"
@@ -187,6 +197,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{1D04506B-4530-4BC4-B0F7-7E46DF497454}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{93C2DD99-4499-419A-8613-A46D02BD2AD4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{870BE181-02C8-4C71-9991-8ED85D7F29A6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{9C21017D-500C-47B2-AA9B-6AAA156CD63E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{DCB15115-80DF-4B22-9810-64DD14938696}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{09B61863-39B4-45FE-9EE6-D486DC386F51}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{41A601F5-19D8-45A9-AE63-33F040315BA6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{42F6092F-A377-42AF-A595-C382F04899A5}"
@@ -195,6 +215,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{549715BC-A4E
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{64423F79-97D4-45E8-9F06-6CFB06A36C0F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{1B8DE64E-4034-4A22-8807-365AA93AFB60}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{3006C4D8-92EA-4340-B762-705D544B5955}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{1EA8CD0F-7062-477B-8CC1-8300E9220CD2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{5C102397-5951-4E65-94C0-9816C0D27DB4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -297,6 +325,22 @@ Global
 		{0B776D27-DC71-432D-AC41-7BCDA6F2001D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0B776D27-DC71-432D-AC41-7BCDA6F2001D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0B776D27-DC71-432D-AC41-7BCDA6F2001D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDD4F886-F31A-4A54-8D09-352364BD1A11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDD4F886-F31A-4A54-8D09-352364BD1A11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDD4F886-F31A-4A54-8D09-352364BD1A11}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDD4F886-F31A-4A54-8D09-352364BD1A11}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E448C7D4-D00F-4663-9D5B-C90F3C746617}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E448C7D4-D00F-4663-9D5B-C90F3C746617}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E448C7D4-D00F-4663-9D5B-C90F3C746617}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E448C7D4-D00F-4663-9D5B-C90F3C746617}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4040013-E2E5-4D9D-B076-BC0A1B833D01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4040013-E2E5-4D9D-B076-BC0A1B833D01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4040013-E2E5-4D9D-B076-BC0A1B833D01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4040013-E2E5-4D9D-B076-BC0A1B833D01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D9E9140-E7EA-4BE2-84A8-AC5E3791D8EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D9E9140-E7EA-4BE2-84A8-AC5E3791D8EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D9E9140-E7EA-4BE2-84A8-AC5E3791D8EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D9E9140-E7EA-4BE2-84A8-AC5E3791D8EB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F07F74E4-0F9E-41B4-924C-380E1DF698E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F07F74E4-0F9E-41B4-924C-380E1DF698E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F07F74E4-0F9E-41B4-924C-380E1DF698E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -485,6 +529,10 @@ Global
 		{4B4E38AB-2BB4-4958-A791-440252601444}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4B4E38AB-2BB4-4958-A791-440252601444}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B4E38AB-2BB4-4958-A791-440252601444}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14313E39-4A4C-405A-BF84-849A09DF3F09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14313E39-4A4C-405A-BF84-849A09DF3F09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14313E39-4A4C-405A-BF84-849A09DF3F09}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14313E39-4A4C-405A-BF84-849A09DF3F09}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7E258A29-16B0-4C3A-B822-2E94BEC6B7AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7E258A29-16B0-4C3A-B822-2E94BEC6B7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7E258A29-16B0-4C3A-B822-2E94BEC6B7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -577,6 +625,26 @@ Global
 		{1D04506B-4530-4BC4-B0F7-7E46DF497454}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D04506B-4530-4BC4-B0F7-7E46DF497454}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1D04506B-4530-4BC4-B0F7-7E46DF497454}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93C2DD99-4499-419A-8613-A46D02BD2AD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93C2DD99-4499-419A-8613-A46D02BD2AD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93C2DD99-4499-419A-8613-A46D02BD2AD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93C2DD99-4499-419A-8613-A46D02BD2AD4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{870BE181-02C8-4C71-9991-8ED85D7F29A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{870BE181-02C8-4C71-9991-8ED85D7F29A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{870BE181-02C8-4C71-9991-8ED85D7F29A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{870BE181-02C8-4C71-9991-8ED85D7F29A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C21017D-500C-47B2-AA9B-6AAA156CD63E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C21017D-500C-47B2-AA9B-6AAA156CD63E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C21017D-500C-47B2-AA9B-6AAA156CD63E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C21017D-500C-47B2-AA9B-6AAA156CD63E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCB15115-80DF-4B22-9810-64DD14938696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCB15115-80DF-4B22-9810-64DD14938696}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCB15115-80DF-4B22-9810-64DD14938696}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCB15115-80DF-4B22-9810-64DD14938696}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09B61863-39B4-45FE-9EE6-D486DC386F51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09B61863-39B4-45FE-9EE6-D486DC386F51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09B61863-39B4-45FE-9EE6-D486DC386F51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09B61863-39B4-45FE-9EE6-D486DC386F51}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -611,6 +679,8 @@ Global
 		{749A707E-3EE2-478B-B0F0-A37045598C76} = {42F6092F-A377-42AF-A595-C382F04899A5}
 		{69CAD162-EEED-4906-968D-99D4DA84E7C9} = {42F6092F-A377-42AF-A595-C382F04899A5}
 		{1C6D51CA-020A-4936-A646-3DB4207D90C3} = {42F6092F-A377-42AF-A595-C382F04899A5}
+		{BDD4F886-F31A-4A54-8D09-352364BD1A11} = {42F6092F-A377-42AF-A595-C382F04899A5}
+		{C4040013-E2E5-4D9D-B076-BC0A1B833D01} = {42F6092F-A377-42AF-A595-C382F04899A5}
 		{F07F74E4-0F9E-41B4-924C-380E1DF698E2} = {42F6092F-A377-42AF-A595-C382F04899A5}
 		{2A25B3CE-4488-4F1B-906C-5F9440EF6C14} = {42F6092F-A377-42AF-A595-C382F04899A5}
 		{04292EC0-2D60-4594-A7A9-F128F74C7132} = {42F6092F-A377-42AF-A595-C382F04899A5}
@@ -645,6 +715,8 @@ Global
 		{94F88257-62C7-4F38-A838-5C327E61B3CC} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F}
 		{117EACAD-89DC-48F1-895B-BC750EE39121} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F}
 		{0B776D27-DC71-432D-AC41-7BCDA6F2001D} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F}
+		{E448C7D4-D00F-4663-9D5B-C90F3C746617} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F}
+		{6D9E9140-E7EA-4BE2-84A8-AC5E3791D8EB} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F}
 		{A44460E9-1ADD-4059-966B-677F6971FB5D} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F}
 		{98F4DDD9-F3C5-47E1-8B3F-AA4893642DFA} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F}
 		{D8D0E8B9-8D10-4E94-9CEF-EF38097BA193} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F}
@@ -670,12 +742,21 @@ Global
 		{B764D730-34BD-4BED-A756-373F2F17391A} = {64423F79-97D4-45E8-9F06-6CFB06A36C0F}
 		{0540EF81-262A-4A23-92E3-14A3971A17A5} = {64423F79-97D4-45E8-9F06-6CFB06A36C0F}
 		{A8840229-74D9-4A14-8975-272C8C436190} = {64423F79-97D4-45E8-9F06-6CFB06A36C0F}
+		{14313E39-4A4C-405A-BF84-849A09DF3F09} = {64423F79-97D4-45E8-9F06-6CFB06A36C0F}
 		{BE1F44EC-1298-412C-BEF9-4578CA6DE547} = {64423F79-97D4-45E8-9F06-6CFB06A36C0F}
 		{1406D871-3350-4754-9E69-DA6E75E56857} = {64423F79-97D4-45E8-9F06-6CFB06A36C0F}
 		{0A3C61A6-F9D7-4189-B23C-41BF629E8237} = {64423F79-97D4-45E8-9F06-6CFB06A36C0F}
 		{5A1C0774-4BF1-478D-812F-5CF34431AAD0} = {64423F79-97D4-45E8-9F06-6CFB06A36C0F}
 		{7EA80D36-7A73-47A8-A6C8-8E0D49CEE93A} = {64423F79-97D4-45E8-9F06-6CFB06A36C0F}
 		{67ABDEA8-6D44-4FB0-A41A-62878F0E04BC} = {64423F79-97D4-45E8-9F06-6CFB06A36C0F}
+		{93C2DD99-4499-419A-8613-A46D02BD2AD4} = {1B8DE64E-4034-4A22-8807-365AA93AFB60}
+		{870BE181-02C8-4C71-9991-8ED85D7F29A6} = {1B8DE64E-4034-4A22-8807-365AA93AFB60}
+		{1B8DE64E-4034-4A22-8807-365AA93AFB60} = {5C102397-5951-4E65-94C0-9816C0D27DB4}
+		{9C21017D-500C-47B2-AA9B-6AAA156CD63E} = {3006C4D8-92EA-4340-B762-705D544B5955}
+		{DCB15115-80DF-4B22-9810-64DD14938696} = {3006C4D8-92EA-4340-B762-705D544B5955}
+		{3006C4D8-92EA-4340-B762-705D544B5955} = {5C102397-5951-4E65-94C0-9816C0D27DB4}
+		{09B61863-39B4-45FE-9EE6-D486DC386F51} = {1EA8CD0F-7062-477B-8CC1-8300E9220CD2}
+		{1EA8CD0F-7062-477B-8CC1-8300E9220CD2} = {5C102397-5951-4E65-94C0-9816C0D27DB4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {80C3C947-5A43-4A55-9E1C-D62738588863}
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 22105c948a306..4a0ce06c5af1b 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
@@ -11,6 +11,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
 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.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\ref\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{E134FF77-0925-4370-85C0-10EFC5F7ED26}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\src\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{E726C5B9-3E85-4A04-945E-F196B8790B58}"
+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}"
@@ -29,22 +33,52 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Loggin
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{3426C067-2EFF-4666-8EE7-EE550C44DE8E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{52A08EB3-0680-4C2A-BA78-7110D9ABBC8C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{320005A1-5A96-4C1C-AAC5-F9714B93CA1D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{7FB59953-BA25-4A9E-864D-219E8CCFEEFE}"
+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.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{BE9283F7-19A3-4349-B9EE-656466A9CD62}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{72EC9B5C-B125-4B84-87DD-6AC0C92C4A74}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{EFB29682-1F77-4E0E-AB8E-418196CFC20F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{BBDA0B2E-BC21-4B90-8704-60600A84CB35}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{984774FC-974E-422D-9C34-5DE60308EC02}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{AE4B08F2-A568-4B2E-BAED-065172234D58}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{CF9B2C75-3FDD-4F6F-9912-E10DB3BA294B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{A16D86E0-B553-4F60-8A5D-F3750BE424E6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{6C3499A5-13E4-48D4-8D45-54B0E96C7287}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{86ABC01C-98A6-40EC-ACB2-62DBED79C5E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{EEE0C0A5-DE33-4F7E-A7CB-3A4D1E2B5CA6}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{39B9C1F2-8309-41E5-B048-921219977818}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CE599F12-D209-41F2-964F-BECBE6D1812D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{2B99B657-DF9B-4557-84F8-9A9FBB66F844}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{4C8454BC-F18B-43BB-A78C-FE788383DAED}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{66291335-CC8C-4DCE-9742-CDE6E6D950C2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -75,6 +109,14 @@ Global
 		{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
+		{E134FF77-0925-4370-85C0-10EFC5F7ED26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E134FF77-0925-4370-85C0-10EFC5F7ED26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E134FF77-0925-4370-85C0-10EFC5F7ED26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E134FF77-0925-4370-85C0-10EFC5F7ED26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E726C5B9-3E85-4A04-945E-F196B8790B58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E726C5B9-3E85-4A04-945E-F196B8790B58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E726C5B9-3E85-4A04-945E-F196B8790B58}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E726C5B9-3E85-4A04-945E-F196B8790B58}.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
@@ -111,6 +153,18 @@ Global
 		{3426C067-2EFF-4666-8EE7-EE550C44DE8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3426C067-2EFF-4666-8EE7-EE550C44DE8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3426C067-2EFF-4666-8EE7-EE550C44DE8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52A08EB3-0680-4C2A-BA78-7110D9ABBC8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52A08EB3-0680-4C2A-BA78-7110D9ABBC8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52A08EB3-0680-4C2A-BA78-7110D9ABBC8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52A08EB3-0680-4C2A-BA78-7110D9ABBC8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{320005A1-5A96-4C1C-AAC5-F9714B93CA1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{320005A1-5A96-4C1C-AAC5-F9714B93CA1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{320005A1-5A96-4C1C-AAC5-F9714B93CA1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{320005A1-5A96-4C1C-AAC5-F9714B93CA1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7FB59953-BA25-4A9E-864D-219E8CCFEEFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FB59953-BA25-4A9E-864D-219E8CCFEEFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FB59953-BA25-4A9E-864D-219E8CCFEEFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7FB59953-BA25-4A9E-864D-219E8CCFEEFE}.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
@@ -119,6 +173,14 @@ Global
 		{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
+		{BE9283F7-19A3-4349-B9EE-656466A9CD62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE9283F7-19A3-4349-B9EE-656466A9CD62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE9283F7-19A3-4349-B9EE-656466A9CD62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE9283F7-19A3-4349-B9EE-656466A9CD62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72EC9B5C-B125-4B84-87DD-6AC0C92C4A74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72EC9B5C-B125-4B84-87DD-6AC0C92C4A74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72EC9B5C-B125-4B84-87DD-6AC0C92C4A74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72EC9B5C-B125-4B84-87DD-6AC0C92C4A74}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EFB29682-1F77-4E0E-AB8E-418196CFC20F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EFB29682-1F77-4E0E-AB8E-418196CFC20F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFB29682-1F77-4E0E-AB8E-418196CFC20F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -131,6 +193,30 @@ Global
 		{984774FC-974E-422D-9C34-5DE60308EC02}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{984774FC-974E-422D-9C34-5DE60308EC02}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{984774FC-974E-422D-9C34-5DE60308EC02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE4B08F2-A568-4B2E-BAED-065172234D58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE4B08F2-A568-4B2E-BAED-065172234D58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE4B08F2-A568-4B2E-BAED-065172234D58}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE4B08F2-A568-4B2E-BAED-065172234D58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF9B2C75-3FDD-4F6F-9912-E10DB3BA294B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF9B2C75-3FDD-4F6F-9912-E10DB3BA294B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF9B2C75-3FDD-4F6F-9912-E10DB3BA294B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF9B2C75-3FDD-4F6F-9912-E10DB3BA294B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A16D86E0-B553-4F60-8A5D-F3750BE424E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A16D86E0-B553-4F60-8A5D-F3750BE424E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A16D86E0-B553-4F60-8A5D-F3750BE424E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A16D86E0-B553-4F60-8A5D-F3750BE424E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C3499A5-13E4-48D4-8D45-54B0E96C7287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C3499A5-13E4-48D4-8D45-54B0E96C7287}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C3499A5-13E4-48D4-8D45-54B0E96C7287}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C3499A5-13E4-48D4-8D45-54B0E96C7287}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86ABC01C-98A6-40EC-ACB2-62DBED79C5E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86ABC01C-98A6-40EC-ACB2-62DBED79C5E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86ABC01C-98A6-40EC-ACB2-62DBED79C5E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86ABC01C-98A6-40EC-ACB2-62DBED79C5E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEE0C0A5-DE33-4F7E-A7CB-3A4D1E2B5CA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEE0C0A5-DE33-4F7E-A7CB-3A4D1E2B5CA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEE0C0A5-DE33-4F7E-A7CB-3A4D1E2B5CA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEE0C0A5-DE33-4F7E-A7CB-3A4D1E2B5CA6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -139,23 +225,39 @@ Global
 		{D1DAA13A-B302-46AB-965A-7610EE55F588} = {39B9C1F2-8309-41E5-B048-921219977818}
 		{47F05662-AD13-4955-A205-0FCE6913FDDB} = {39B9C1F2-8309-41E5-B048-921219977818}
 		{963867EB-DEAF-487E-A3E8-71AE9379AD53} = {39B9C1F2-8309-41E5-B048-921219977818}
+		{E134FF77-0925-4370-85C0-10EFC5F7ED26} = {39B9C1F2-8309-41E5-B048-921219977818}
 		{08064208-D005-4C34-B152-D03C7D173D60} = {39B9C1F2-8309-41E5-B048-921219977818}
 		{7CCF5CE0-3840-4AA1-810F-138D001F2486} = {39B9C1F2-8309-41E5-B048-921219977818}
 		{C4FD2984-3E22-47AF-8584-FF908D9D3E43} = {39B9C1F2-8309-41E5-B048-921219977818}
+		{320005A1-5A96-4C1C-AAC5-F9714B93CA1D} = {39B9C1F2-8309-41E5-B048-921219977818}
 		{99CF7377-8E77-4EDB-B04F-E546ACCCE84D} = {39B9C1F2-8309-41E5-B048-921219977818}
+		{BE9283F7-19A3-4349-B9EE-656466A9CD62} = {39B9C1F2-8309-41E5-B048-921219977818}
+		{AE4B08F2-A568-4B2E-BAED-065172234D58} = {39B9C1F2-8309-41E5-B048-921219977818}
 		{E9CC25E1-367A-41E4-A710-5C5AB7475F40} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}
 		{7F238E01-3021-4F87-B463-A4AB5B91F753} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}
 		{60641184-B841-4F48-A917-76618114916A} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}
+		{E726C5B9-3E85-4A04-945E-F196B8790B58} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}
 		{17917EA7-19F2-4CC0-AD52-B04AA4D254F8} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}
 		{664450C6-102A-435A-875B-3445B3332E90} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}
 		{3426C067-2EFF-4666-8EE7-EE550C44DE8E} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}
+		{7FB59953-BA25-4A9E-864D-219E8CCFEEFE} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}
 		{A7370C94-090B-4F79-A964-8029481D60FC} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}
+		{72EC9B5C-B125-4B84-87DD-6AC0C92C4A74} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}
 		{3A11089C-B572-4F57-AB9A-B9F54D2CD1DE} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15}
 		{95E4261F-F449-48A5-83AF-3BA144A023A3} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15}
 		{40F96C08-9936-47DA-AA41-E54954F02EE8} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15}
+		{52A08EB3-0680-4C2A-BA78-7110D9ABBC8C} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15}
 		{EFB29682-1F77-4E0E-AB8E-418196CFC20F} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15}
 		{BBDA0B2E-BC21-4B90-8704-60600A84CB35} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15}
 		{984774FC-974E-422D-9C34-5DE60308EC02} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15}
+		{CF9B2C75-3FDD-4F6F-9912-E10DB3BA294B} = {CE599F12-D209-41F2-964F-BECBE6D1812D}
+		{A16D86E0-B553-4F60-8A5D-F3750BE424E6} = {CE599F12-D209-41F2-964F-BECBE6D1812D}
+		{CE599F12-D209-41F2-964F-BECBE6D1812D} = {66291335-CC8C-4DCE-9742-CDE6E6D950C2}
+		{6C3499A5-13E4-48D4-8D45-54B0E96C7287} = {2B99B657-DF9B-4557-84F8-9A9FBB66F844}
+		{86ABC01C-98A6-40EC-ACB2-62DBED79C5E8} = {2B99B657-DF9B-4557-84F8-9A9FBB66F844}
+		{2B99B657-DF9B-4557-84F8-9A9FBB66F844} = {66291335-CC8C-4DCE-9742-CDE6E6D950C2}
+		{EEE0C0A5-DE33-4F7E-A7CB-3A4D1E2B5CA6} = {4C8454BC-F18B-43BB-A78C-FE788383DAED}
+		{4C8454BC-F18B-43BB-A78C-FE788383DAED} = {66291335-CC8C-4DCE-9742-CDE6E6D950C2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7897D6F2-D18F-4ABB-9698-593AE45059C5}
diff --git a/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln b/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln
index 5dddad667af87..7fc11dab72e0c 100644
--- a/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln
@@ -47,6 +47,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{4067DFDE-ECAE-42EE-BFC9-920BC95B2109}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\ref\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{EBF2037F-2F40-4E6D-B790-8254E1201080}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\src\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{064D2FE8-D638-4E0A-821F-002ED3571D72}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\ref\Microsoft.Extensions.Diagnostics.csproj", "{E7CCB629-F791-445B-8BED-7537B5314572}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\src\Microsoft.Extensions.Diagnostics.csproj", "{079248AE-6567-497E-ACF7-3A0F8A0F7981}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{B8C25E82-EF3B-4448-939B-781FEC478870}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{D8C3A422-16FC-4992-A501-EE53DAA0EDD1}"
@@ -111,6 +119,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Option
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{AA0DB387-9639-4997-A4B7-555EF45BFB4A}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{3765CD5F-C4BF-40F4-8223-0434957D49E5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{C206A9B3-F9FE-4771-93F4-7AC7930CF844}"
@@ -157,6 +167,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{78496963-2F57-410C-B89F-539700E2901D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{3C8144E2-A75B-4D18-9F8A-7E69BBB23F46}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{16A5B90D-A9CC-4B3D-8C6F-D91D51CBC91A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{72CF4F8C-96CE-4E3E-876E-AC607A855237}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{37919F9F-4E5B-40F4-A638-80107902D4BF}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9504A671-7FF4-41AA-AF67-5EBD0CF86561}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}"
@@ -165,6 +185,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{192FD259-E55
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{694561D4-7901-4727-B87C-109C7CED0404}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{578F9128-4119-40F9-8276-3643FA73D2D6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{495ED7E7-5804-4509-BCD4-354556D7D1A2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{341A9CE3-A519-4EDF-8E80-25D982C281D3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2D6EEE82-E5EB-423E-AFB3-6941FACCF1A2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -267,6 +295,22 @@ Global
 		{4067DFDE-ECAE-42EE-BFC9-920BC95B2109}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4067DFDE-ECAE-42EE-BFC9-920BC95B2109}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4067DFDE-ECAE-42EE-BFC9-920BC95B2109}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBF2037F-2F40-4E6D-B790-8254E1201080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBF2037F-2F40-4E6D-B790-8254E1201080}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBF2037F-2F40-4E6D-B790-8254E1201080}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBF2037F-2F40-4E6D-B790-8254E1201080}.Release|Any CPU.Build.0 = Release|Any CPU
+		{064D2FE8-D638-4E0A-821F-002ED3571D72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{064D2FE8-D638-4E0A-821F-002ED3571D72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{064D2FE8-D638-4E0A-821F-002ED3571D72}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{064D2FE8-D638-4E0A-821F-002ED3571D72}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E7CCB629-F791-445B-8BED-7537B5314572}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7CCB629-F791-445B-8BED-7537B5314572}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7CCB629-F791-445B-8BED-7537B5314572}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E7CCB629-F791-445B-8BED-7537B5314572}.Release|Any CPU.Build.0 = Release|Any CPU
+		{079248AE-6567-497E-ACF7-3A0F8A0F7981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{079248AE-6567-497E-ACF7-3A0F8A0F7981}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{079248AE-6567-497E-ACF7-3A0F8A0F7981}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{079248AE-6567-497E-ACF7-3A0F8A0F7981}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B8C25E82-EF3B-4448-939B-781FEC478870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B8C25E82-EF3B-4448-939B-781FEC478870}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B8C25E82-EF3B-4448-939B-781FEC478870}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -395,6 +439,10 @@ Global
 		{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA0DB387-9639-4997-A4B7-555EF45BFB4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA0DB387-9639-4997-A4B7-555EF45BFB4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA0DB387-9639-4997-A4B7-555EF45BFB4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA0DB387-9639-4997-A4B7-555EF45BFB4A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3765CD5F-C4BF-40F4-8223-0434957D49E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3765CD5F-C4BF-40F4-8223-0434957D49E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3765CD5F-C4BF-40F4-8223-0434957D49E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -487,6 +535,26 @@ Global
 		{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78496963-2F57-410C-B89F-539700E2901D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78496963-2F57-410C-B89F-539700E2901D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78496963-2F57-410C-B89F-539700E2901D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78496963-2F57-410C-B89F-539700E2901D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C8144E2-A75B-4D18-9F8A-7E69BBB23F46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C8144E2-A75B-4D18-9F8A-7E69BBB23F46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C8144E2-A75B-4D18-9F8A-7E69BBB23F46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C8144E2-A75B-4D18-9F8A-7E69BBB23F46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16A5B90D-A9CC-4B3D-8C6F-D91D51CBC91A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16A5B90D-A9CC-4B3D-8C6F-D91D51CBC91A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16A5B90D-A9CC-4B3D-8C6F-D91D51CBC91A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16A5B90D-A9CC-4B3D-8C6F-D91D51CBC91A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72CF4F8C-96CE-4E3E-876E-AC607A855237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72CF4F8C-96CE-4E3E-876E-AC607A855237}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72CF4F8C-96CE-4E3E-876E-AC607A855237}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72CF4F8C-96CE-4E3E-876E-AC607A855237}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37919F9F-4E5B-40F4-A638-80107902D4BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37919F9F-4E5B-40F4-A638-80107902D4BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37919F9F-4E5B-40F4-A638-80107902D4BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37919F9F-4E5B-40F4-A638-80107902D4BF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -505,6 +573,8 @@ Global
 		{E7387064-C6EB-438E-8893-4F478403E568} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
 		{05E9D59A-7FA1-4BE3-953E-F99109AFBCA3} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
 		{B8625AE9-AEF9-4A41-B208-60F0526BE5B6} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
+		{EBF2037F-2F40-4E6D-B790-8254E1201080} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
+		{E7CCB629-F791-445B-8BED-7537B5314572} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
 		{B8C25E82-EF3B-4448-939B-781FEC478870} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
 		{0B5BA863-7777-471F-8393-EBBD41D10D9E} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
 		{1A3EF133-CC86-4CC9-BBB8-333D41563AC3} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
@@ -540,6 +610,8 @@ Global
 		{CE8EDD88-76E2-4154-A41C-45B2004634BD} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
 		{AF0F4768-8A3D-42CF-ACA9-79E989EB4A72} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
 		{4067DFDE-ECAE-42EE-BFC9-920BC95B2109} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
+		{064D2FE8-D638-4E0A-821F-002ED3571D72} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
+		{079248AE-6567-497E-ACF7-3A0F8A0F7981} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
 		{D8C3A422-16FC-4992-A501-EE53DAA0EDD1} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
 		{410F3407-0106-442D-9BA2-88395D62BF2C} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
 		{9C03BBD2-3EC8-4E82-9C3E-E4C869A65611} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
@@ -565,12 +637,21 @@ Global
 		{5F69DAFF-F4BC-4E29-A4FA-E96A4D55EC2D} = {694561D4-7901-4727-B87C-109C7CED0404}
 		{0D1BFEB4-CEF6-4319-9212-E3E7840B287A} = {694561D4-7901-4727-B87C-109C7CED0404}
 		{7D8C7904-C8AC-4732-89BE-0DB348E6E9AC} = {694561D4-7901-4727-B87C-109C7CED0404}
+		{AA0DB387-9639-4997-A4B7-555EF45BFB4A} = {694561D4-7901-4727-B87C-109C7CED0404}
 		{E89B69FA-5B8B-4921-97BF-AA8FB60C7A15} = {694561D4-7901-4727-B87C-109C7CED0404}
 		{EDF8F173-CFE7-40FB-8EEB-795A1DFB6D99} = {694561D4-7901-4727-B87C-109C7CED0404}
 		{D8A16E22-8BF8-49ED-A033-0150D6341282} = {694561D4-7901-4727-B87C-109C7CED0404}
 		{5C6A1B61-B02B-46AA-8AD5-B8F61EE57453} = {694561D4-7901-4727-B87C-109C7CED0404}
 		{771CB4BB-4237-444E-82CE-C81A4979D89F} = {694561D4-7901-4727-B87C-109C7CED0404}
 		{DBEB8F5B-477E-4602-A59B-5154ED1934C3} = {694561D4-7901-4727-B87C-109C7CED0404}
+		{78496963-2F57-410C-B89F-539700E2901D} = {578F9128-4119-40F9-8276-3643FA73D2D6}
+		{3C8144E2-A75B-4D18-9F8A-7E69BBB23F46} = {578F9128-4119-40F9-8276-3643FA73D2D6}
+		{578F9128-4119-40F9-8276-3643FA73D2D6} = {2D6EEE82-E5EB-423E-AFB3-6941FACCF1A2}
+		{16A5B90D-A9CC-4B3D-8C6F-D91D51CBC91A} = {495ED7E7-5804-4509-BCD4-354556D7D1A2}
+		{72CF4F8C-96CE-4E3E-876E-AC607A855237} = {495ED7E7-5804-4509-BCD4-354556D7D1A2}
+		{495ED7E7-5804-4509-BCD4-354556D7D1A2} = {2D6EEE82-E5EB-423E-AFB3-6941FACCF1A2}
+		{37919F9F-4E5B-40F4-A638-80107902D4BF} = {341A9CE3-A519-4EDF-8E80-25D982C281D3}
+		{341A9CE3-A519-4EDF-8E80-25D982C281D3} = {2D6EEE82-E5EB-423E-AFB3-6941FACCF1A2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EFB87E5C-C4CE-4855-8CBB-B20180560CB1}
diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln
index 58d1fca086c7d..d8a2363e23212 100644
--- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln
@@ -47,6 +47,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{C913A82A-3C17-4991-8F66-9D9F0B841E5E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\ref\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{230CCF86-346A-4630-BD85-598786B8EF1D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\src\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{CA0D9981-F876-4287-9004-CADF6FC3857B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\ref\Microsoft.Extensions.Diagnostics.csproj", "{2A14AAD0-A0D8-4F60-9856-A6A1864C9574}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\src\Microsoft.Extensions.Diagnostics.csproj", "{37802587-1E56-4DFD-A402-DB290D76B892}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{67A6FA6A-F171-4A00-80ED-113736B2B5B5}"
@@ -111,6 +119,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Option
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{E5CD419F-E73D-4BFF-B9D8-ACDE673E31BF}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{70A40879-BA02-4860-9A55-D13DE8A456D8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{5DBF21B8-1E05-4774-A63D-E6C22CDFEA1A}"
@@ -161,6 +171,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{C50BBD27-2445-4DF4-9A1D-C7919D016BBC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{CB6E9B8A-23D7-4729-BD1C-BFB1A674B3E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{BE9E89C9-DF1D-4017-ACA4-94E140012552}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{71157AAE-7328-4F43-9271-9382DE0AA535}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{875A08A8-21BC-497A-87A7-9BF1DB1E4753}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{EE488D47-ACB9-471D-AD00-4B5AFA059DE2}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6D06A6CA-BD7E-44A3-8BE5-E071E1B27993}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BFC0CC54-6781-45CB-865F-72E9FABBD023}"
@@ -169,6 +189,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{76933DF1-12A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0D30E826-4EE9-4404-A74D-5255FDB76A12}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{54C0A08B-8701-4156-95C2-FE76F944D6DD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{8DB6681D-8F84-41AF-BA16-63710F908AD3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{EA444929-AF9D-4323-A5F8-21977E55DB5F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2E68F57E-9A7D-4FC4-B8CC-93A1448786C1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -271,6 +299,22 @@ Global
 		{C913A82A-3C17-4991-8F66-9D9F0B841E5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C913A82A-3C17-4991-8F66-9D9F0B841E5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C913A82A-3C17-4991-8F66-9D9F0B841E5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{230CCF86-346A-4630-BD85-598786B8EF1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{230CCF86-346A-4630-BD85-598786B8EF1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{230CCF86-346A-4630-BD85-598786B8EF1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{230CCF86-346A-4630-BD85-598786B8EF1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA0D9981-F876-4287-9004-CADF6FC3857B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA0D9981-F876-4287-9004-CADF6FC3857B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA0D9981-F876-4287-9004-CADF6FC3857B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA0D9981-F876-4287-9004-CADF6FC3857B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A14AAD0-A0D8-4F60-9856-A6A1864C9574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A14AAD0-A0D8-4F60-9856-A6A1864C9574}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A14AAD0-A0D8-4F60-9856-A6A1864C9574}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A14AAD0-A0D8-4F60-9856-A6A1864C9574}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37802587-1E56-4DFD-A402-DB290D76B892}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37802587-1E56-4DFD-A402-DB290D76B892}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37802587-1E56-4DFD-A402-DB290D76B892}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37802587-1E56-4DFD-A402-DB290D76B892}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -399,6 +443,10 @@ Global
 		{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5CD419F-E73D-4BFF-B9D8-ACDE673E31BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5CD419F-E73D-4BFF-B9D8-ACDE673E31BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5CD419F-E73D-4BFF-B9D8-ACDE673E31BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5CD419F-E73D-4BFF-B9D8-ACDE673E31BF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{70A40879-BA02-4860-9A55-D13DE8A456D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{70A40879-BA02-4860-9A55-D13DE8A456D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{70A40879-BA02-4860-9A55-D13DE8A456D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -499,6 +547,26 @@ Global
 		{C50BBD27-2445-4DF4-9A1D-C7919D016BBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C50BBD27-2445-4DF4-9A1D-C7919D016BBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C50BBD27-2445-4DF4-9A1D-C7919D016BBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB6E9B8A-23D7-4729-BD1C-BFB1A674B3E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB6E9B8A-23D7-4729-BD1C-BFB1A674B3E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB6E9B8A-23D7-4729-BD1C-BFB1A674B3E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB6E9B8A-23D7-4729-BD1C-BFB1A674B3E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE9E89C9-DF1D-4017-ACA4-94E140012552}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE9E89C9-DF1D-4017-ACA4-94E140012552}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE9E89C9-DF1D-4017-ACA4-94E140012552}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE9E89C9-DF1D-4017-ACA4-94E140012552}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71157AAE-7328-4F43-9271-9382DE0AA535}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71157AAE-7328-4F43-9271-9382DE0AA535}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71157AAE-7328-4F43-9271-9382DE0AA535}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71157AAE-7328-4F43-9271-9382DE0AA535}.Release|Any CPU.Build.0 = Release|Any CPU
+		{875A08A8-21BC-497A-87A7-9BF1DB1E4753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{875A08A8-21BC-497A-87A7-9BF1DB1E4753}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{875A08A8-21BC-497A-87A7-9BF1DB1E4753}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{875A08A8-21BC-497A-87A7-9BF1DB1E4753}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE488D47-ACB9-471D-AD00-4B5AFA059DE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE488D47-ACB9-471D-AD00-4B5AFA059DE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE488D47-ACB9-471D-AD00-4B5AFA059DE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE488D47-ACB9-471D-AD00-4B5AFA059DE2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -517,6 +585,8 @@ Global
 		{8E08B694-3806-492C-BCEC-7B74420E3041} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
 		{749A4A89-3CA2-49E1-B03C-3AB1A1C6FAFD} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
 		{F5C79255-45C9-464F-A5A7-EB9678B3F9AD} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
+		{230CCF86-346A-4630-BD85-598786B8EF1D} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
+		{2A14AAD0-A0D8-4F60-9856-A6A1864C9574} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
 		{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
 		{C6B1BE99-1AC3-4D2A-BD5B-74DBD8449C17} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
 		{C114AFF6-377C-4694-B869-3B590317E87A} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
@@ -553,6 +623,8 @@ Global
 		{B1AEB3DD-F8D6-48D1-8DB4-B232DA4103A0} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
 		{C9B7388B-0963-49A3-AB52-3E3B724EE2A9} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
 		{C913A82A-3C17-4991-8F66-9D9F0B841E5E} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
+		{CA0D9981-F876-4287-9004-CADF6FC3857B} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
+		{37802587-1E56-4DFD-A402-DB290D76B892} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
 		{67A6FA6A-F171-4A00-80ED-113736B2B5B5} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
 		{07A9935C-015D-43DD-9CDE-809301151F7C} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
 		{BAE78100-3020-4AAE-BDBF-ACF9D1D1BA2F} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
@@ -579,12 +651,21 @@ Global
 		{D3A7C7B1-10DC-45E9-8678-2C964A1459D7} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
 		{59BC5420-D5C8-4689-8F9E-1E8AC338180E} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
 		{ACA22F95-D64E-462A-99C6-CB31B3F45347} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
+		{E5CD419F-E73D-4BFF-B9D8-ACDE673E31BF} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
 		{72D5BDD7-85ED-4CBF-9659-5AE4BD863A4C} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
 		{34C7A201-C14D-4586-9903-8358EF179EAD} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
 		{11EE7722-5FA4-403C-B53B-59A154EE0267} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
 		{0EC461A2-083B-4E9E-AADE-935ECB15B951} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
 		{2CEA1741-8B0C-41F8-9CA9-B827D329261F} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
 		{9842527F-AC6E-4ADD-92AF-1DF8613B83C6} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
+		{CB6E9B8A-23D7-4729-BD1C-BFB1A674B3E8} = {54C0A08B-8701-4156-95C2-FE76F944D6DD}
+		{BE9E89C9-DF1D-4017-ACA4-94E140012552} = {54C0A08B-8701-4156-95C2-FE76F944D6DD}
+		{54C0A08B-8701-4156-95C2-FE76F944D6DD} = {2E68F57E-9A7D-4FC4-B8CC-93A1448786C1}
+		{71157AAE-7328-4F43-9271-9382DE0AA535} = {8DB6681D-8F84-41AF-BA16-63710F908AD3}
+		{875A08A8-21BC-497A-87A7-9BF1DB1E4753} = {8DB6681D-8F84-41AF-BA16-63710F908AD3}
+		{8DB6681D-8F84-41AF-BA16-63710F908AD3} = {2E68F57E-9A7D-4FC4-B8CC-93A1448786C1}
+		{EE488D47-ACB9-471D-AD00-4B5AFA059DE2} = {EA444929-AF9D-4323-A5F8-21977E55DB5F}
+		{EA444929-AF9D-4323-A5F8-21977E55DB5F} = {2E68F57E-9A7D-4FC4-B8CC-93A1448786C1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {81854B5B-5AA0-49DC-9B7B-9E2DB24D7507}
diff --git a/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln b/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
index 3b0d013e478b8..1f52fec20a33b 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
@@ -1,8 +1,4 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.7.33711.374
-MinimumVisualStudioVersion = 10.0.40219.1
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{47ACDB6F-34CB-478D-9E43-F3662EE5838D}"
@@ -51,6 +47,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
 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.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\ref\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{982C5C02-DD1E-452C-B5BC-13207D2CB14F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\src\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{FB173557-75BD-4943-B813-0AD13E0337A3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\ref\Microsoft.Extensions.Diagnostics.csproj", "{A9181F84-BD47-4B46-AD71-908E289A695E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\src\Microsoft.Extensions.Diagnostics.csproj", "{5B630ECF-5C4D-4F66-9AB9-59B014520A5C}"
+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}"
@@ -115,6 +119,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Option
 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.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{85C80343-56B0-4D77-8A5F-8E4A773F103C}"
+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}"
@@ -161,6 +167,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 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}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{549FCDB5-9443-4309-B4BF-05B954598BB0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{C01638F8-A351-46CD-88FC-AE3DBB4CF0BC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{6914525A-4D84-4ED1-9B74-ED7C529C9FF4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{F44D3D54-91AE-4708-ACEF-03466C82594C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{B36E82D9-D804-403B-AA91-DAC04F79FCBB}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E041754F-1A93-443A-9294-87DC1C30B471}"
@@ -169,13 +185,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{59A29BF0-B76
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A9A8D649-4C09-4FD1-9837-EE7B9D902253}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\src\Microsoft.Extensions.Diagnostics.csproj", "{5B630ECF-5C4D-4F66-9AB9-59B014520A5C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{A946CE10-3582-4BA0-92CA-92D356344C91}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\src\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{FB173557-75BD-4943-B813-0AD13E0337A3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{C47E3FF0-6FEC-49AE-B66C-C67CBC47A606}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\ref\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{982C5C02-DD1E-452C-B5BC-13207D2CB14F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{71475D1B-D7B2-40B6-9228-E97900F0FD2B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\ref\Microsoft.Extensions.Diagnostics.csproj", "{A9181F84-BD47-4B46-AD71-908E289A695E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{E88EEE4C-2DFE-4C8E-B822-EA42282D0C59}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -279,6 +295,22 @@ Global
 		{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
+		{982C5C02-DD1E-452C-B5BC-13207D2CB14F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{982C5C02-DD1E-452C-B5BC-13207D2CB14F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{982C5C02-DD1E-452C-B5BC-13207D2CB14F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{982C5C02-DD1E-452C-B5BC-13207D2CB14F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB173557-75BD-4943-B813-0AD13E0337A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB173557-75BD-4943-B813-0AD13E0337A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB173557-75BD-4943-B813-0AD13E0337A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB173557-75BD-4943-B813-0AD13E0337A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9181F84-BD47-4B46-AD71-908E289A695E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9181F84-BD47-4B46-AD71-908E289A695E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9181F84-BD47-4B46-AD71-908E289A695E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9181F84-BD47-4B46-AD71-908E289A695E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B630ECF-5C4D-4F66-9AB9-59B014520A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B630ECF-5C4D-4F66-9AB9-59B014520A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B630ECF-5C4D-4F66-9AB9-59B014520A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B630ECF-5C4D-4F66-9AB9-59B014520A5C}.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
@@ -407,6 +439,10 @@ Global
 		{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
+		{85C80343-56B0-4D77-8A5F-8E4A773F103C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85C80343-56B0-4D77-8A5F-8E4A773F103C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85C80343-56B0-4D77-8A5F-8E4A773F103C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85C80343-56B0-4D77-8A5F-8E4A773F103C}.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
@@ -499,110 +535,123 @@ Global
 		{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
-		{5B630ECF-5C4D-4F66-9AB9-59B014520A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B630ECF-5C4D-4F66-9AB9-59B014520A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B630ECF-5C4D-4F66-9AB9-59B014520A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5B630ECF-5C4D-4F66-9AB9-59B014520A5C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FB173557-75BD-4943-B813-0AD13E0337A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB173557-75BD-4943-B813-0AD13E0337A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB173557-75BD-4943-B813-0AD13E0337A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FB173557-75BD-4943-B813-0AD13E0337A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{982C5C02-DD1E-452C-B5BC-13207D2CB14F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{982C5C02-DD1E-452C-B5BC-13207D2CB14F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{982C5C02-DD1E-452C-B5BC-13207D2CB14F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{982C5C02-DD1E-452C-B5BC-13207D2CB14F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A9181F84-BD47-4B46-AD71-908E289A695E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9181F84-BD47-4B46-AD71-908E289A695E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9181F84-BD47-4B46-AD71-908E289A695E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9181F84-BD47-4B46-AD71-908E289A695E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{549FCDB5-9443-4309-B4BF-05B954598BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{549FCDB5-9443-4309-B4BF-05B954598BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{549FCDB5-9443-4309-B4BF-05B954598BB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{549FCDB5-9443-4309-B4BF-05B954598BB0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C01638F8-A351-46CD-88FC-AE3DBB4CF0BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C01638F8-A351-46CD-88FC-AE3DBB4CF0BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C01638F8-A351-46CD-88FC-AE3DBB4CF0BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C01638F8-A351-46CD-88FC-AE3DBB4CF0BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6914525A-4D84-4ED1-9B74-ED7C529C9FF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6914525A-4D84-4ED1-9B74-ED7C529C9FF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6914525A-4D84-4ED1-9B74-ED7C529C9FF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6914525A-4D84-4ED1-9B74-ED7C529C9FF4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F44D3D54-91AE-4708-ACEF-03466C82594C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F44D3D54-91AE-4708-ACEF-03466C82594C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F44D3D54-91AE-4708-ACEF-03466C82594C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F44D3D54-91AE-4708-ACEF-03466C82594C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B36E82D9-D804-403B-AA91-DAC04F79FCBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B36E82D9-D804-403B-AA91-DAC04F79FCBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B36E82D9-D804-403B-AA91-DAC04F79FCBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B36E82D9-D804-403B-AA91-DAC04F79FCBB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{BCAE2699-A994-48FE-B9B0-5580D267BD2E} = {06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D}
+		{2A882DCC-96C1-4EDF-A7F0-B526EC81533F} = {06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D}
+		{495208B7-31BB-4802-A769-CEE4917BDF75} = {06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D}
+		{33C3D8F0-297F-4471-92B0-F4E8717F10E3} = {06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D}
 		{47ACDB6F-34CB-478D-9E43-F3662EE5838D} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{C24E4188-27CB-4E00-A5F0-62AE23D536EE} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{EDAC3418-1D4E-4216-9371-0A36EA1E13FE} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{020874FC-11A2-4FC7-8929-527462F8819A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{53A78CBA-7270-4F79-84EF-09F669729079} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
 		{670AB88D-85C9-4674-A652-C27488ED73F9} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{3411D565-223A-44B5-864C-E30F826001B4} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{4AB3E652-6709-4011-AC2F-C379A0415BAC} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{ECA6E734-3908-45B4-9DFA-FDDA49AD620D} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{3D657A5A-C7DF-4817-864F-944755DCE6DF} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{0C041643-1217-466B-AF2E-1E44C7B117B1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{BD938E1D-6FC8-4D46-B103-B4D35761CEA2} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{6DB8DE55-5419-48EA-B4CD-2880E00409FB} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{1C07ECD0-F69E-4E35-9C68-E4063B5D97EC} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{0A738527-821F-4089-B64E-3C0F4714DC78} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{37A36947-2652-4AFD-BCF8-AAFD4D4D2827} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{EA9E6747-867B-4312-94B3-624EEB1C7A7A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{13BC7AAA-7831-4500-9D28-A93FA4CA3C74} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{EB889E78-AE59-4D41-AC29-8BC4D58BCE16} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{135F551E-ACB8-4073-ABB5-A1FA558455DE} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{0EEA7382-25A8-4FB0-AE9A-4ECDF2FF6FB7} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{5532E155-E423-4FFD-B009-80B4281D36BA} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{982C5C02-DD1E-452C-B5BC-13207D2CB14F} = {E041754F-1A93-443A-9294-87DC1C30B471}
+		{A9181F84-BD47-4B46-AD71-908E289A695E} = {E041754F-1A93-443A-9294-87DC1C30B471}
 		{24220AD7-03ED-427A-BFC8-114C475EAD0F} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{0A021166-613C-430C-8460-50F1E0DF7AD8} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{376BB9D1-6C3E-4BB1-B13A-F0750D2BE01F} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{1E3D564C-A79E-4E28-8E13-626EE7780831} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{E4157F2E-F11D-48C6-A146-B4D12D9211F7} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{9C06E60B-2D45-4284-B7C8-7AE6D8194CE0} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{2F25C0DB-E010-4802-8030-C88E2D09D3B0} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{973CE6DA-B55D-4E55-88D5-53BE69D44410} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{0D7771CB-B3D1-4FF4-A523-40BFD3B12A84} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{F5CF1FC4-8F56-49BD-BFC2-5AD42AE6302D} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{2A882DCC-96C1-4EDF-A7F0-B526EC81533F} = {06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D}
-		{495208B7-31BB-4802-A769-CEE4917BDF75} = {06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D}
-		{33C3D8F0-297F-4471-92B0-F4E8717F10E3} = {06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D}
-		{1B235247-6666-4B62-95A4-AC043626FDEA} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
-		{5F6EF6F2-A742-445B-9418-682188F61130} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
-		{3F732A69-1E48-4EA7-A40E-9C6C9332388E} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
 		{42E1BF94-6FE0-4017-9702-55913BD95EDE} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{8845E6FF-94B2-4994-A8F4-DF30844A2168} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{15AD68F8-6C58-41A3-99B3-558C42A6E7A5} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{99C8FB58-8718-4E76-AEFA-3C42F2F729B1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{28C9D427-83BA-46A6-BEF5-6994A07F2258} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{098CEEE6-91D3-4A7C-A5D5-6BB329BB2B7B} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{B729474D-0E96-4296-B317-450EE24F6B48} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{9ADBD2EE-D390-490C-BBEA-F844FE6F371E} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{465AE1C4-84DD-4864-916A-74D89DC3BBBC} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{D466E363-F930-4D26-AE55-0256182961DD} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{D69326FC-CD05-4690-91C0-1537A80ACBFF} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{518D4AE0-FBFF-493A-A2DF-8ACBA842AE19} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{0AEAD15B-CD38-4462-A36C-655ED8D0CBD1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{DD121F9F-3548-4247-8E10-FB584FC0827C} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{25C5119A-AAFB-4C74-9E12-F747CA4D80E7} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{45235656-E284-4682-BE70-9A284FD73243} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{D975AE29-0CA2-43FC-90A0-B266DF7D4C2A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{FA490103-0140-473C-A572-72D529249234} = {E041754F-1A93-443A-9294-87DC1C30B471}
 		{F90D2ED9-A38D-4E0B-AB9C-651FD24F23E2} = {E041754F-1A93-443A-9294-87DC1C30B471}
 		{28726AEF-2732-4832-8930-074ACD9DC732} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{0BC9E4F4-5C34-4B90-80AB-2933992D99A6} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{34ECA788-A105-411B-AE8B-17B7CC1D703D} = {E041754F-1A93-443A-9294-87DC1C30B471}
+		{9DB83E87-F09F-4DE0-8127-8C9509F0649B} = {E041754F-1A93-443A-9294-87DC1C30B471}
+		{000F87DC-0D56-4B37-8A0E-F7BCB3C3B61A} = {E041754F-1A93-443A-9294-87DC1C30B471}
+		{C595A27A-FA05-4BC8-9048-402338D7AF76} = {E041754F-1A93-443A-9294-87DC1C30B471}
+		{1E3D79D4-51D6-46C6-BF0F-DF51A47C5952} = {E041754F-1A93-443A-9294-87DC1C30B471}
+		{C24E4188-27CB-4E00-A5F0-62AE23D536EE} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{020874FC-11A2-4FC7-8929-527462F8819A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{3411D565-223A-44B5-864C-E30F826001B4} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{ECA6E734-3908-45B4-9DFA-FDDA49AD620D} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{0C041643-1217-466B-AF2E-1E44C7B117B1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{6DB8DE55-5419-48EA-B4CD-2880E00409FB} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{0A738527-821F-4089-B64E-3C0F4714DC78} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{EA9E6747-867B-4312-94B3-624EEB1C7A7A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{EB889E78-AE59-4D41-AC29-8BC4D58BCE16} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{0EEA7382-25A8-4FB0-AE9A-4ECDF2FF6FB7} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{FB173557-75BD-4943-B813-0AD13E0337A3} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{5B630ECF-5C4D-4F66-9AB9-59B014520A5C} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{0A021166-613C-430C-8460-50F1E0DF7AD8} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{1E3D564C-A79E-4E28-8E13-626EE7780831} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{9C06E60B-2D45-4284-B7C8-7AE6D8194CE0} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{973CE6DA-B55D-4E55-88D5-53BE69D44410} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{F5CF1FC4-8F56-49BD-BFC2-5AD42AE6302D} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{8845E6FF-94B2-4994-A8F4-DF30844A2168} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{99C8FB58-8718-4E76-AEFA-3C42F2F729B1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{B729474D-0E96-4296-B317-450EE24F6B48} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{D466E363-F930-4D26-AE55-0256182961DD} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{518D4AE0-FBFF-493A-A2DF-8ACBA842AE19} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{0AEAD15B-CD38-4462-A36C-655ED8D0CBD1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{25C5119A-AAFB-4C74-9E12-F747CA4D80E7} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{D975AE29-0CA2-43FC-90A0-B266DF7D4C2A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{0BC9E4F4-5C34-4B90-80AB-2933992D99A6} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{A5DD36AF-F0AD-4616-AB91-BC63E89B2744} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{4ED9C0A9-C1EF-47ED-99F8-74B7411C971B} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{9DB83E87-F09F-4DE0-8127-8C9509F0649B} = {E041754F-1A93-443A-9294-87DC1C30B471}
+		{B41AA17B-5129-41CC-8EA4-250B80BABF87} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{0813853E-8C78-429A-B01A-3FB2EF1898F8} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{53A78CBA-7270-4F79-84EF-09F669729079} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
+		{1B235247-6666-4B62-95A4-AC043626FDEA} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
+		{5F6EF6F2-A742-445B-9418-682188F61130} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
+		{3F732A69-1E48-4EA7-A40E-9C6C9332388E} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
+		{85C80343-56B0-4D77-8A5F-8E4A773F103C} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
 		{CCF8862C-E2D7-45B0-96EF-54134178DA5A} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
 		{C00722C2-E56B-424F-9216-FA6A91788986} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
 		{90DD4D77-E3DC-456E-A27F-F13DA6194481} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
-		{000F87DC-0D56-4B37-8A0E-F7BCB3C3B61A} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{C595A27A-FA05-4BC8-9048-402338D7AF76} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{B41AA17B-5129-41CC-8EA4-250B80BABF87} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
 		{0A495D7B-44DE-4E59-8497-6CBF7C55CFA5} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
 		{B69B7D59-6E7D-43FC-B83F-AA481B677B06} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
 		{4F7612BF-0AFB-4AC5-952F-7D12D99FA357} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
-		{1E3D79D4-51D6-46C6-BF0F-DF51A47C5952} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{0813853E-8C78-429A-B01A-3FB2EF1898F8} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{5B630ECF-5C4D-4F66-9AB9-59B014520A5C} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{FB173557-75BD-4943-B813-0AD13E0337A3} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{982C5C02-DD1E-452C-B5BC-13207D2CB14F} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{A9181F84-BD47-4B46-AD71-908E289A695E} = {E041754F-1A93-443A-9294-87DC1C30B471}
+		{549FCDB5-9443-4309-B4BF-05B954598BB0} = {A946CE10-3582-4BA0-92CA-92D356344C91}
+		{C01638F8-A351-46CD-88FC-AE3DBB4CF0BC} = {A946CE10-3582-4BA0-92CA-92D356344C91}
+		{A946CE10-3582-4BA0-92CA-92D356344C91} = {E88EEE4C-2DFE-4C8E-B822-EA42282D0C59}
+		{6914525A-4D84-4ED1-9B74-ED7C529C9FF4} = {C47E3FF0-6FEC-49AE-B66C-C67CBC47A606}
+		{F44D3D54-91AE-4708-ACEF-03466C82594C} = {C47E3FF0-6FEC-49AE-B66C-C67CBC47A606}
+		{C47E3FF0-6FEC-49AE-B66C-C67CBC47A606} = {E88EEE4C-2DFE-4C8E-B822-EA42282D0C59}
+		{B36E82D9-D804-403B-AA91-DAC04F79FCBB} = {71475D1B-D7B2-40B6-9228-E97900F0FD2B}
+		{71475D1B-D7B2-40B6-9228-E97900F0FD2B} = {E88EEE4C-2DFE-4C8E-B822-EA42282D0C59}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {971198CC-ACB9-4718-9024-42A87E02E503}
diff --git a/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln b/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
index 7e9a298e94c1d..127ab92e837f4 100644
--- a/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
+++ b/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
@@ -1,14 +1,24 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.7.33920.267
-MinimumVisualStudioVersion = 10.0.40219.1
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{7110AF00-8902-4693-8697-64B89F6ADFEB}"
 EndProject
 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.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{E5AA98EF-5984-4BC4-9C74-996DB070BEB3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{65753AD0-5912-4EC7-A109-51AD5CC2A631}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder.SourceGeneration", "..\Microsoft.Extensions.Configuration.Binder\gen\Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj", "{0946F780-A82A-478E-A3A6-08C00A9B56BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{DCFA391D-345B-4272-81EB-2C46DB12F760}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{02CBE5AC-8D26-4865-830C-39EAA631316F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{B69CDA6C-D2C9-4A23-BDC7-D2EAE11503C4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{64B7B55F-C630-45FF-AE38-B88E33054559}"
+EndProject
 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.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{A0EBE0C7-F63B-477C-BDE5-6B57AB9DB540}"
@@ -17,6 +27,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
 EndProject
 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.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\ref\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{1C037F40-BDCD-4DFD-B6BE-3244D22065F3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\src\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{6FE46896-2751-47A8-816D-839AA45144F2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\ref\Microsoft.Extensions.Diagnostics.csproj", "{C914A1FF-48C4-42AD-9581-6846FFD8BF5B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\src\Microsoft.Extensions.Diagnostics.csproj", "{C1325BED-B16C-42B3-B0F6-94D6BB737376}"
+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}"
@@ -37,6 +55,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Loggin
 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.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\ref\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{933CC409-0AD9-4C63-997F-9E4EA9A0F977}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{9EC12899-D011-4E8A-B8E8-FD44BE7516CA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{34143E09-2676-4D22-B454-B719EF0629DA}"
+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}"
@@ -57,6 +81,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{4F6E71CD-E4CE-4FF6-AAD9-3A07A0ADBE0D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{DFABB1CD-6617-4548-8C8A-5EF3A420064A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{B970690E-B4ED-455B-BBCE-352502CCF51F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{7EE1562B-61F6-4793-AFCD-CADBDFBEE0BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{5FE5DB86-05C2-4C42-88CA-EBA6B80D4157}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A94D324B-E4DC-457B-AF34-9466FEAEA7D9}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AC22531E-0F15-4324-9241-2BD562CB7C6B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ACFC297E-FE60-47EE-99A0-501E795FF4D6}"
@@ -65,17 +99,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{96EA71C4-C73
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D1CE7D63-2182-40E3-83E0-618DA3770779}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{64B7B55F-C630-45FF-AE38-B88E33054559}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{B69CDA6C-D2C9-4A23-BDC7-D2EAE11503C4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{65753AD0-5912-4EC7-A109-51AD5CC2A631}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{FDC92BCB-A135-47C1-A3A3-30D5D743D0A1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{E5AA98EF-5984-4BC4-9C74-996DB070BEB3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{E60DFD51-6528-4986-B895-74FBE060E903}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\src\Microsoft.Extensions.Diagnostics.csproj", "{C1325BED-B16C-42B3-B0F6-94D6BB737376}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{F4AA4F86-5C36-4C01-A53D-3EF100F8D639}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\ref\Microsoft.Extensions.Diagnostics.csproj", "{C914A1FF-48C4-42AD-9581-6846FFD8BF5B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{FB594D2B-E686-434A-B07D-4D50C82F63D8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -95,6 +125,34 @@ Global
 		{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
+		{E5AA98EF-5984-4BC4-9C74-996DB070BEB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5AA98EF-5984-4BC4-9C74-996DB070BEB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5AA98EF-5984-4BC4-9C74-996DB070BEB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5AA98EF-5984-4BC4-9C74-996DB070BEB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65753AD0-5912-4EC7-A109-51AD5CC2A631}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65753AD0-5912-4EC7-A109-51AD5CC2A631}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65753AD0-5912-4EC7-A109-51AD5CC2A631}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65753AD0-5912-4EC7-A109-51AD5CC2A631}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0946F780-A82A-478E-A3A6-08C00A9B56BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0946F780-A82A-478E-A3A6-08C00A9B56BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0946F780-A82A-478E-A3A6-08C00A9B56BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0946F780-A82A-478E-A3A6-08C00A9B56BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCFA391D-345B-4272-81EB-2C46DB12F760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCFA391D-345B-4272-81EB-2C46DB12F760}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCFA391D-345B-4272-81EB-2C46DB12F760}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCFA391D-345B-4272-81EB-2C46DB12F760}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02CBE5AC-8D26-4865-830C-39EAA631316F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02CBE5AC-8D26-4865-830C-39EAA631316F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02CBE5AC-8D26-4865-830C-39EAA631316F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02CBE5AC-8D26-4865-830C-39EAA631316F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B69CDA6C-D2C9-4A23-BDC7-D2EAE11503C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B69CDA6C-D2C9-4A23-BDC7-D2EAE11503C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B69CDA6C-D2C9-4A23-BDC7-D2EAE11503C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B69CDA6C-D2C9-4A23-BDC7-D2EAE11503C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64B7B55F-C630-45FF-AE38-B88E33054559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64B7B55F-C630-45FF-AE38-B88E33054559}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64B7B55F-C630-45FF-AE38-B88E33054559}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64B7B55F-C630-45FF-AE38-B88E33054559}.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
@@ -111,6 +169,22 @@ Global
 		{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
+		{1C037F40-BDCD-4DFD-B6BE-3244D22065F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C037F40-BDCD-4DFD-B6BE-3244D22065F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C037F40-BDCD-4DFD-B6BE-3244D22065F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C037F40-BDCD-4DFD-B6BE-3244D22065F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FE46896-2751-47A8-816D-839AA45144F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FE46896-2751-47A8-816D-839AA45144F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FE46896-2751-47A8-816D-839AA45144F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FE46896-2751-47A8-816D-839AA45144F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C914A1FF-48C4-42AD-9581-6846FFD8BF5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C914A1FF-48C4-42AD-9581-6846FFD8BF5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C914A1FF-48C4-42AD-9581-6846FFD8BF5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C914A1FF-48C4-42AD-9581-6846FFD8BF5B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1325BED-B16C-42B3-B0F6-94D6BB737376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1325BED-B16C-42B3-B0F6-94D6BB737376}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1325BED-B16C-42B3-B0F6-94D6BB737376}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1325BED-B16C-42B3-B0F6-94D6BB737376}.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
@@ -151,6 +225,18 @@ Global
 		{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
+		{933CC409-0AD9-4C63-997F-9E4EA9A0F977}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{933CC409-0AD9-4C63-997F-9E4EA9A0F977}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{933CC409-0AD9-4C63-997F-9E4EA9A0F977}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{933CC409-0AD9-4C63-997F-9E4EA9A0F977}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9EC12899-D011-4E8A-B8E8-FD44BE7516CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EC12899-D011-4E8A-B8E8-FD44BE7516CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EC12899-D011-4E8A-B8E8-FD44BE7516CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9EC12899-D011-4E8A-B8E8-FD44BE7516CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34143E09-2676-4D22-B454-B719EF0629DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34143E09-2676-4D22-B454-B719EF0629DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34143E09-2676-4D22-B454-B719EF0629DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34143E09-2676-4D22-B454-B719EF0629DA}.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
@@ -191,68 +277,80 @@ Global
 		{4F6E71CD-E4CE-4FF6-AAD9-3A07A0ADBE0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4F6E71CD-E4CE-4FF6-AAD9-3A07A0ADBE0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4F6E71CD-E4CE-4FF6-AAD9-3A07A0ADBE0D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{64B7B55F-C630-45FF-AE38-B88E33054559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{64B7B55F-C630-45FF-AE38-B88E33054559}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{64B7B55F-C630-45FF-AE38-B88E33054559}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{64B7B55F-C630-45FF-AE38-B88E33054559}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B69CDA6C-D2C9-4A23-BDC7-D2EAE11503C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B69CDA6C-D2C9-4A23-BDC7-D2EAE11503C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B69CDA6C-D2C9-4A23-BDC7-D2EAE11503C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B69CDA6C-D2C9-4A23-BDC7-D2EAE11503C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{65753AD0-5912-4EC7-A109-51AD5CC2A631}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{65753AD0-5912-4EC7-A109-51AD5CC2A631}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{65753AD0-5912-4EC7-A109-51AD5CC2A631}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{65753AD0-5912-4EC7-A109-51AD5CC2A631}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5AA98EF-5984-4BC4-9C74-996DB070BEB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5AA98EF-5984-4BC4-9C74-996DB070BEB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5AA98EF-5984-4BC4-9C74-996DB070BEB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5AA98EF-5984-4BC4-9C74-996DB070BEB3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C1325BED-B16C-42B3-B0F6-94D6BB737376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1325BED-B16C-42B3-B0F6-94D6BB737376}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1325BED-B16C-42B3-B0F6-94D6BB737376}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C1325BED-B16C-42B3-B0F6-94D6BB737376}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C914A1FF-48C4-42AD-9581-6846FFD8BF5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C914A1FF-48C4-42AD-9581-6846FFD8BF5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C914A1FF-48C4-42AD-9581-6846FFD8BF5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C914A1FF-48C4-42AD-9581-6846FFD8BF5B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DFABB1CD-6617-4548-8C8A-5EF3A420064A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFABB1CD-6617-4548-8C8A-5EF3A420064A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFABB1CD-6617-4548-8C8A-5EF3A420064A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DFABB1CD-6617-4548-8C8A-5EF3A420064A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B970690E-B4ED-455B-BBCE-352502CCF51F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B970690E-B4ED-455B-BBCE-352502CCF51F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B970690E-B4ED-455B-BBCE-352502CCF51F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B970690E-B4ED-455B-BBCE-352502CCF51F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7EE1562B-61F6-4793-AFCD-CADBDFBEE0BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EE1562B-61F6-4793-AFCD-CADBDFBEE0BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EE1562B-61F6-4793-AFCD-CADBDFBEE0BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EE1562B-61F6-4793-AFCD-CADBDFBEE0BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FE5DB86-05C2-4C42-88CA-EBA6B80D4157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FE5DB86-05C2-4C42-88CA-EBA6B80D4157}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FE5DB86-05C2-4C42-88CA-EBA6B80D4157}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FE5DB86-05C2-4C42-88CA-EBA6B80D4157}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A94D324B-E4DC-457B-AF34-9466FEAEA7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A94D324B-E4DC-457B-AF34-9466FEAEA7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A94D324B-E4DC-457B-AF34-9466FEAEA7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A94D324B-E4DC-457B-AF34-9466FEAEA7D9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{DE515C8F-654E-4434-8F3F-014ECD86369D} = {AC22531E-0F15-4324-9241-2BD562CB7C6B}
+		{58A1E42E-5DA1-452A-B39C-A1819171970A} = {AC22531E-0F15-4324-9241-2BD562CB7C6B}
 		{7110AF00-8902-4693-8697-64B89F6ADFEB} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{8E552A7E-0C8C-49C2-8988-19469A732E26} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{E5AA98EF-5984-4BC4-9C74-996DB070BEB3} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
+		{DCFA391D-345B-4272-81EB-2C46DB12F760} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
+		{B69CDA6C-D2C9-4A23-BDC7-D2EAE11503C4} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
 		{35FEC7D0-BA1A-49B3-B183-309CC182E60B} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{A0EBE0C7-F63B-477C-BDE5-6B57AB9DB540} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
 		{E004A4D8-CDC5-40F7-A6CD-94DA232F6B1B} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{B792E72A-0513-4359-B754-D0372610DDCE} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{1C037F40-BDCD-4DFD-B6BE-3244D22065F3} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
+		{C914A1FF-48C4-42AD-9581-6846FFD8BF5B} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
 		{D4D155B6-2A90-4ECD-97F9-A288F7979375} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{1236A517-6B61-4A62-9495-1C945EDA4D12} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
-		{58A1E42E-5DA1-452A-B39C-A1819171970A} = {AC22531E-0F15-4324-9241-2BD562CB7C6B}
-		{2F7292AF-429F-4888-B938-B6615F06E838} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
-		{136C7622-75EE-4C95-9642-DAD4A5392274} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
-		{E0BC3CBF-BE02-4228-AF7F-876CC4C832EA} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
 		{85615392-9242-4CAF-A0FE-A439FF615462} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{BAFF07C7-1F5F-4706-B7D7-9D5D309CBFE2} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
 		{40143A60-7177-4173-90D4-2891584748CA} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{65079F8F-0653-4474-B105-551A9B6F102B} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{933CC409-0AD9-4C63-997F-9E4EA9A0F977} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
 		{BECC7A6E-1438-4EAC-B34B-276DEF463769} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{A12B92C6-071A-4C61-8934-371DBB240873} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
 		{DE012146-4D34-44CC-8701-53C42F2943D2} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{68B501BC-5281-4BC8-B631-C34013E4505E} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
 		{9E199047-514B-4D38-A8A3-0F5F18547F88} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
+		{4F6E71CD-E4CE-4FF6-AAD9-3A07A0ADBE0D} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
+		{8E552A7E-0C8C-49C2-8988-19469A732E26} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{65753AD0-5912-4EC7-A109-51AD5CC2A631} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{02CBE5AC-8D26-4865-830C-39EAA631316F} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{64B7B55F-C630-45FF-AE38-B88E33054559} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{A0EBE0C7-F63B-477C-BDE5-6B57AB9DB540} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{B792E72A-0513-4359-B754-D0372610DDCE} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{6FE46896-2751-47A8-816D-839AA45144F2} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{C1325BED-B16C-42B3-B0F6-94D6BB737376} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{1236A517-6B61-4A62-9495-1C945EDA4D12} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{BAFF07C7-1F5F-4706-B7D7-9D5D309CBFE2} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{65079F8F-0653-4474-B105-551A9B6F102B} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{9EC12899-D011-4E8A-B8E8-FD44BE7516CA} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{A12B92C6-071A-4C61-8934-371DBB240873} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{68B501BC-5281-4BC8-B631-C34013E4505E} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
 		{1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{0946F780-A82A-478E-A3A6-08C00A9B56BB} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
+		{2F7292AF-429F-4888-B938-B6615F06E838} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
+		{136C7622-75EE-4C95-9642-DAD4A5392274} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
+		{E0BC3CBF-BE02-4228-AF7F-876CC4C832EA} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
+		{34143E09-2676-4D22-B454-B719EF0629DA} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
 		{B11D1627-86EC-4E6D-A184-868DD220AB9B} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
 		{083B8368-1518-40DE-904F-CD028C8E21F1} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
 		{167FDAED-3220-4516-AC8F-C506F593896D} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
-		{4F6E71CD-E4CE-4FF6-AAD9-3A07A0ADBE0D} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{64B7B55F-C630-45FF-AE38-B88E33054559} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
-		{B69CDA6C-D2C9-4A23-BDC7-D2EAE11503C4} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{65753AD0-5912-4EC7-A109-51AD5CC2A631} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
-		{E5AA98EF-5984-4BC4-9C74-996DB070BEB3} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{C1325BED-B16C-42B3-B0F6-94D6BB737376} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
-		{C914A1FF-48C4-42AD-9581-6846FFD8BF5B} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
+		{DFABB1CD-6617-4548-8C8A-5EF3A420064A} = {FDC92BCB-A135-47C1-A3A3-30D5D743D0A1}
+		{B970690E-B4ED-455B-BBCE-352502CCF51F} = {FDC92BCB-A135-47C1-A3A3-30D5D743D0A1}
+		{FDC92BCB-A135-47C1-A3A3-30D5D743D0A1} = {FB594D2B-E686-434A-B07D-4D50C82F63D8}
+		{7EE1562B-61F6-4793-AFCD-CADBDFBEE0BB} = {E60DFD51-6528-4986-B895-74FBE060E903}
+		{5FE5DB86-05C2-4C42-88CA-EBA6B80D4157} = {E60DFD51-6528-4986-B895-74FBE060E903}
+		{E60DFD51-6528-4986-B895-74FBE060E903} = {FB594D2B-E686-434A-B07D-4D50C82F63D8}
+		{A94D324B-E4DC-457B-AF34-9466FEAEA7D9} = {F4AA4F86-5C36-4C01-A53D-3EF100F8D639}
+		{F4AA4F86-5C36-4C01-A53D-3EF100F8D639} = {FB594D2B-E686-434A-B07D-4D50C82F63D8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {02FCA09C-178B-4DE0-98E0-BCCDEBA97903}
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 4647569062bba..4064dd66cbf19 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
@@ -23,12 +23,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Loggin
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests", "tests\Microsoft.Extensions.Logging.Generators.Tests\Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests.csproj", "{1CB869A7-2EEC-4A53-9C33-DF9E0C75825B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{E718874C-9D26-4FB6-9CFB-0AD5818C1F75}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{852D4E16-58C3-47C2-A6BC-A5B12B37209F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{6645D0C4-83D1-4426-B9CD-67096CB7A60F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{848C51FA-3CCE-4402-8E5F-C670B6A9FEBC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{80116AFB-28C4-42BE-89CC-6FEC58235C05}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{7AC0D7D3-C720-4FB0-840E-347898CF5FEA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{06C934AC-F891-41CF-A4C4-7D6A82018AEC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{F3186815-B9A5-455F-B0DF-E39D4235C24F}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7631380A-FB73-4241-9987-0891A21E9769}"
@@ -37,6 +45,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{548DF5F7-790
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{03F31CEE-D63E-4E7F-949F-139B33DC3385}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{87F606D1-D311-4EDC-9A37-8F008B55597C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{8215F79E-510B-4CA1-B775-50C47BB58360}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{14DFA192-3C7E-4F10-B5FD-3953BC82A6B1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{58760833-B4F5-429D-9ABD-15FDF83E25CD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,10 +107,6 @@ Global
 		{1CB869A7-2EEC-4A53-9C33-DF9E0C75825B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1CB869A7-2EEC-4A53-9C33-DF9E0C75825B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1CB869A7-2EEC-4A53-9C33-DF9E0C75825B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E718874C-9D26-4FB6-9CFB-0AD5818C1F75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E718874C-9D26-4FB6-9CFB-0AD5818C1F75}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E718874C-9D26-4FB6-9CFB-0AD5818C1F75}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E718874C-9D26-4FB6-9CFB-0AD5818C1F75}.Release|Any CPU.Build.0 = Release|Any CPU
 		{852D4E16-58C3-47C2-A6BC-A5B12B37209F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{852D4E16-58C3-47C2-A6BC-A5B12B37209F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{852D4E16-58C3-47C2-A6BC-A5B12B37209F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -103,6 +115,26 @@ Global
 		{6645D0C4-83D1-4426-B9CD-67096CB7A60F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6645D0C4-83D1-4426-B9CD-67096CB7A60F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6645D0C4-83D1-4426-B9CD-67096CB7A60F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{848C51FA-3CCE-4402-8E5F-C670B6A9FEBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{848C51FA-3CCE-4402-8E5F-C670B6A9FEBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{848C51FA-3CCE-4402-8E5F-C670B6A9FEBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{848C51FA-3CCE-4402-8E5F-C670B6A9FEBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80116AFB-28C4-42BE-89CC-6FEC58235C05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80116AFB-28C4-42BE-89CC-6FEC58235C05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80116AFB-28C4-42BE-89CC-6FEC58235C05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80116AFB-28C4-42BE-89CC-6FEC58235C05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AC0D7D3-C720-4FB0-840E-347898CF5FEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AC0D7D3-C720-4FB0-840E-347898CF5FEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AC0D7D3-C720-4FB0-840E-347898CF5FEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AC0D7D3-C720-4FB0-840E-347898CF5FEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06C934AC-F891-41CF-A4C4-7D6A82018AEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06C934AC-F891-41CF-A4C4-7D6A82018AEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06C934AC-F891-41CF-A4C4-7D6A82018AEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06C934AC-F891-41CF-A4C4-7D6A82018AEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3186815-B9A5-455F-B0DF-E39D4235C24F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3186815-B9A5-455F-B0DF-E39D4235C24F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3186815-B9A5-455F-B0DF-E39D4235C24F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3186815-B9A5-455F-B0DF-E39D4235C24F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -120,9 +152,16 @@ Global
 		{1491B9C9-955D-4DB0-B1D5-70137A78EAAE} = {03F31CEE-D63E-4E7F-949F-139B33DC3385}
 		{A5439E79-96D6-4F02-8DD0-23DFF979851D} = {03F31CEE-D63E-4E7F-949F-139B33DC3385}
 		{BF948816-45E1-4F0F-985A-0B4DB4D3BF40} = {03F31CEE-D63E-4E7F-949F-139B33DC3385}
-		{E718874C-9D26-4FB6-9CFB-0AD5818C1F75} = {03F31CEE-D63E-4E7F-949F-139B33DC3385}
 		{852D4E16-58C3-47C2-A6BC-A5B12B37209F} = {03F31CEE-D63E-4E7F-949F-139B33DC3385}
 		{6645D0C4-83D1-4426-B9CD-67096CB7A60F} = {03F31CEE-D63E-4E7F-949F-139B33DC3385}
+		{848C51FA-3CCE-4402-8E5F-C670B6A9FEBC} = {87F606D1-D311-4EDC-9A37-8F008B55597C}
+		{80116AFB-28C4-42BE-89CC-6FEC58235C05} = {87F606D1-D311-4EDC-9A37-8F008B55597C}
+		{87F606D1-D311-4EDC-9A37-8F008B55597C} = {58760833-B4F5-429D-9ABD-15FDF83E25CD}
+		{7AC0D7D3-C720-4FB0-840E-347898CF5FEA} = {8215F79E-510B-4CA1-B775-50C47BB58360}
+		{06C934AC-F891-41CF-A4C4-7D6A82018AEC} = {8215F79E-510B-4CA1-B775-50C47BB58360}
+		{8215F79E-510B-4CA1-B775-50C47BB58360} = {58760833-B4F5-429D-9ABD-15FDF83E25CD}
+		{F3186815-B9A5-455F-B0DF-E39D4235C24F} = {14DFA192-3C7E-4F10-B5FD-3953BC82A6B1}
+		{14DFA192-3C7E-4F10-B5FD-3953BC82A6B1} = {58760833-B4F5-429D-9ABD-15FDF83E25CD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {450DA749-CBDC-4BDC-950F-8A491CF59D49}
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 6d1032db3ab21..d3bcec2ebd569 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
@@ -47,6 +47,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Option
 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.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{28A7A861-15D3-4FB9-BF74-57C835A32727}"
+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}"
@@ -67,12 +69,30 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{F0673641-1B37-485D-9CEA-DB45AC93AA75}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{F0259C06-98B1-4F6D-9B4A-DF7F7C54B7BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{6F3A4754-E4C7-4862-A32E-DBF6AD96B733}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{18E48841-1DCF-43B1-B006-6C181C40136E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{E76EB0ED-26B7-4852-B503-29239800FC41}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{0869A065-1C81-4332-BAA8-A882C6F8E7AC}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3B592E91-F7DB-4B78-A1CE-CB1CA436220E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D7763B6D-EFA4-4393-B548-EBA806172FA1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{B93E3A68-BEC3-42B4-B560-F5E9E4BF94B8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{E9C3F9BB-5B4C-49A7-9E30-741645E3F179}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{D92654ED-DCD4-4A51-8F85-AE965D4E4B0C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -175,6 +195,10 @@ Global
 		{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
+		{28A7A861-15D3-4FB9-BF74-57C835A32727}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28A7A861-15D3-4FB9-BF74-57C835A32727}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28A7A861-15D3-4FB9-BF74-57C835A32727}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28A7A861-15D3-4FB9-BF74-57C835A32727}.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
@@ -215,6 +239,26 @@ Global
 		{F0673641-1B37-485D-9CEA-DB45AC93AA75}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F0673641-1B37-485D-9CEA-DB45AC93AA75}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F0673641-1B37-485D-9CEA-DB45AC93AA75}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0259C06-98B1-4F6D-9B4A-DF7F7C54B7BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0259C06-98B1-4F6D-9B4A-DF7F7C54B7BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0259C06-98B1-4F6D-9B4A-DF7F7C54B7BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0259C06-98B1-4F6D-9B4A-DF7F7C54B7BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F3A4754-E4C7-4862-A32E-DBF6AD96B733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F3A4754-E4C7-4862-A32E-DBF6AD96B733}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F3A4754-E4C7-4862-A32E-DBF6AD96B733}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F3A4754-E4C7-4862-A32E-DBF6AD96B733}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18E48841-1DCF-43B1-B006-6C181C40136E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18E48841-1DCF-43B1-B006-6C181C40136E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18E48841-1DCF-43B1-B006-6C181C40136E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18E48841-1DCF-43B1-B006-6C181C40136E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E76EB0ED-26B7-4852-B503-29239800FC41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E76EB0ED-26B7-4852-B503-29239800FC41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E76EB0ED-26B7-4852-B503-29239800FC41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E76EB0ED-26B7-4852-B503-29239800FC41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0869A065-1C81-4332-BAA8-A882C6F8E7AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0869A065-1C81-4332-BAA8-A882C6F8E7AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0869A065-1C81-4332-BAA8-A882C6F8E7AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0869A065-1C81-4332-BAA8-A882C6F8E7AC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -251,9 +295,18 @@ Global
 		{77AA759E-5BF0-4C86-91EB-2A33263553EC} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}
 		{A5BA71C3-A03C-43F7-B48E-96C301E87691} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}
 		{962C4BF1-F689-4344-847D-9A657E55B5FA} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}
+		{28A7A861-15D3-4FB9-BF74-57C835A32727} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}
 		{2BD666C1-CC16-4A64-B915-06701A1B54BA} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}
 		{4531AA3F-D0FC-4C1F-BF54-71E0D29CBA16} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}
 		{5D09D653-A257-4673-810F-6157486964F4} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}
+		{F0259C06-98B1-4F6D-9B4A-DF7F7C54B7BB} = {D7763B6D-EFA4-4393-B548-EBA806172FA1}
+		{6F3A4754-E4C7-4862-A32E-DBF6AD96B733} = {D7763B6D-EFA4-4393-B548-EBA806172FA1}
+		{D7763B6D-EFA4-4393-B548-EBA806172FA1} = {D92654ED-DCD4-4A51-8F85-AE965D4E4B0C}
+		{18E48841-1DCF-43B1-B006-6C181C40136E} = {B93E3A68-BEC3-42B4-B560-F5E9E4BF94B8}
+		{E76EB0ED-26B7-4852-B503-29239800FC41} = {B93E3A68-BEC3-42B4-B560-F5E9E4BF94B8}
+		{B93E3A68-BEC3-42B4-B560-F5E9E4BF94B8} = {D92654ED-DCD4-4A51-8F85-AE965D4E4B0C}
+		{0869A065-1C81-4332-BAA8-A882C6F8E7AC} = {E9C3F9BB-5B4C-49A7-9E30-741645E3F179}
+		{E9C3F9BB-5B4C-49A7-9E30-741645E3F179} = {D92654ED-DCD4-4A51-8F85-AE965D4E4B0C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E5154479-615B-4978-AE5A-A7DE55907E36}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln b/src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln
index 24cbc019287ec..a5e6035963e57 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
@@ -55,6 +55,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Option
 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.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{CD1A607B-CB38-4381-BF23-FCEFD3B8C54F}"
+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}"
@@ -95,6 +97,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{86AD3CC6-85A5-41F4-88EC-C324BBBE24B1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{CB4946DA-CD15-4729-B8C9-281773DC5C65}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{37EC2137-0726-4E00-B116-5BA33254028C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{E4B50474-4BA4-4E81-A570-4E8127AB3BB5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{4E37DDCC-96C2-479B-8E8D-A9352B295A74}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A7BC3DE4-5E79-4552-8E42-D1D13B7293CB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AB19DE2B-6A14-4CDA-94EF-845BAF293051}"
@@ -103,6 +115,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F3BAE0A3-1AF
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{561502B1-98F5-40E0-B9D5-0F720E88E657}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{EEC72C1F-23B2-4486-B81F-46DFC2266BD3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{8EA484F8-18AF-4CE6-AFEF-31EBE0400D43}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{EB5E73CD-8E86-4C9F-9804-CD9938434B44}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{54582BF4-47BD-4876-8D58-C293BABF9E73}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -221,6 +241,10 @@ Global
 		{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
+		{CD1A607B-CB38-4381-BF23-FCEFD3B8C54F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD1A607B-CB38-4381-BF23-FCEFD3B8C54F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD1A607B-CB38-4381-BF23-FCEFD3B8C54F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD1A607B-CB38-4381-BF23-FCEFD3B8C54F}.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
@@ -301,6 +325,26 @@ Global
 		{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
+		{86AD3CC6-85A5-41F4-88EC-C324BBBE24B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86AD3CC6-85A5-41F4-88EC-C324BBBE24B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86AD3CC6-85A5-41F4-88EC-C324BBBE24B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86AD3CC6-85A5-41F4-88EC-C324BBBE24B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB4946DA-CD15-4729-B8C9-281773DC5C65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB4946DA-CD15-4729-B8C9-281773DC5C65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB4946DA-CD15-4729-B8C9-281773DC5C65}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB4946DA-CD15-4729-B8C9-281773DC5C65}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37EC2137-0726-4E00-B116-5BA33254028C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37EC2137-0726-4E00-B116-5BA33254028C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37EC2137-0726-4E00-B116-5BA33254028C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37EC2137-0726-4E00-B116-5BA33254028C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E4B50474-4BA4-4E81-A570-4E8127AB3BB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4B50474-4BA4-4E81-A570-4E8127AB3BB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4B50474-4BA4-4E81-A570-4E8127AB3BB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E4B50474-4BA4-4E81-A570-4E8127AB3BB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E37DDCC-96C2-479B-8E8D-A9352B295A74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E37DDCC-96C2-479B-8E8D-A9352B295A74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E37DDCC-96C2-479B-8E8D-A9352B295A74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E37DDCC-96C2-479B-8E8D-A9352B295A74}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -348,12 +392,21 @@ Global
 		{424A18FB-010E-4B03-B1E7-6747E1C5E31E} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
 		{2ECBDD0B-43A8-408E-B770-878F64620915} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
 		{629A8EEE-69D9-4EBA-BDB4-D0CDE942D3DB} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
+		{CD1A607B-CB38-4381-BF23-FCEFD3B8C54F} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
 		{9D77F47E-EA44-4FA4-A04F-ED022D91F429} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
 		{17C4DD18-64B1-43FF-89A2-1D5EBFD4202E} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
 		{83BADB4A-BD97-4121-B0B8-78BD3E3A352A} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
 		{A276A0DD-B092-455B-90A7-6EE82BFF4C4B} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
 		{F26A20A7-F0B2-4410-972C-15DACEEBDB8C} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
 		{92CCAC1D-3D54-44C0-A4E5-FF125B8362D5} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
+		{86AD3CC6-85A5-41F4-88EC-C324BBBE24B1} = {EEC72C1F-23B2-4486-B81F-46DFC2266BD3}
+		{CB4946DA-CD15-4729-B8C9-281773DC5C65} = {EEC72C1F-23B2-4486-B81F-46DFC2266BD3}
+		{EEC72C1F-23B2-4486-B81F-46DFC2266BD3} = {54582BF4-47BD-4876-8D58-C293BABF9E73}
+		{37EC2137-0726-4E00-B116-5BA33254028C} = {8EA484F8-18AF-4CE6-AFEF-31EBE0400D43}
+		{E4B50474-4BA4-4E81-A570-4E8127AB3BB5} = {8EA484F8-18AF-4CE6-AFEF-31EBE0400D43}
+		{8EA484F8-18AF-4CE6-AFEF-31EBE0400D43} = {54582BF4-47BD-4876-8D58-C293BABF9E73}
+		{4E37DDCC-96C2-479B-8E8D-A9352B295A74} = {EB5E73CD-8E86-4C9F-9804-CD9938434B44}
+		{EB5E73CD-8E86-4C9F-9804-CD9938434B44} = {54582BF4-47BD-4876-8D58-C293BABF9E73}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C1591684-381C-4761-A20A-4B7FA24E5557}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln b/src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln
index 85abab99c11b7..563292a17f208 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
@@ -29,6 +29,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Loggin
 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.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{79A27ACF-3616-4F3A-912A-85B066CAFBB7}"
+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}"
@@ -49,12 +51,30 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{17936926-B6EA-4194-AC9B-E7274BBF58B9}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{AD3D11F1-8E50-4728-9ADE-90CFC857852C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{FA3CC022-8C7A-4F25-B3E5-55807B2B52C2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{EEA44216-44E1-4D42-85E0-50667F4F1372}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{5A2C5964-E515-47DD-B605-263FDD0FFA9C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{EC051CA0-5FE0-4E40-AEB8-53DE784FCC3E}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{33C65345-4AE9-41DF-8CC8-5C81979DBD03}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B1578203-268C-45C3-B62C-3D5CFC340AB4}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{B57846B6-4EB4-475F-AF4D-A4317F6B7754}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{A3955AC6-1263-49DE-9D9A-85B0C58A4DBF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{D3C33399-9FC9-4F62-9883-D6D338D0233B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{48EC3A74-596C-4075-A2E6-D73B2360DB14}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -121,6 +141,10 @@ Global
 		{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
+		{79A27ACF-3616-4F3A-912A-85B066CAFBB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79A27ACF-3616-4F3A-912A-85B066CAFBB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79A27ACF-3616-4F3A-912A-85B066CAFBB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79A27ACF-3616-4F3A-912A-85B066CAFBB7}.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
@@ -161,6 +185,26 @@ Global
 		{17936926-B6EA-4194-AC9B-E7274BBF58B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{17936926-B6EA-4194-AC9B-E7274BBF58B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17936926-B6EA-4194-AC9B-E7274BBF58B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD3D11F1-8E50-4728-9ADE-90CFC857852C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD3D11F1-8E50-4728-9ADE-90CFC857852C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD3D11F1-8E50-4728-9ADE-90CFC857852C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD3D11F1-8E50-4728-9ADE-90CFC857852C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA3CC022-8C7A-4F25-B3E5-55807B2B52C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA3CC022-8C7A-4F25-B3E5-55807B2B52C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA3CC022-8C7A-4F25-B3E5-55807B2B52C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA3CC022-8C7A-4F25-B3E5-55807B2B52C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEA44216-44E1-4D42-85E0-50667F4F1372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEA44216-44E1-4D42-85E0-50667F4F1372}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEA44216-44E1-4D42-85E0-50667F4F1372}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEA44216-44E1-4D42-85E0-50667F4F1372}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A2C5964-E515-47DD-B605-263FDD0FFA9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A2C5964-E515-47DD-B605-263FDD0FFA9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A2C5964-E515-47DD-B605-263FDD0FFA9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A2C5964-E515-47DD-B605-263FDD0FFA9C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC051CA0-5FE0-4E40-AEB8-53DE784FCC3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC051CA0-5FE0-4E40-AEB8-53DE784FCC3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC051CA0-5FE0-4E40-AEB8-53DE784FCC3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC051CA0-5FE0-4E40-AEB8-53DE784FCC3E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -188,9 +232,18 @@ Global
 		{6D60A144-E901-4BCB-8DE6-148B56157771} = {B1578203-268C-45C3-B62C-3D5CFC340AB4}
 		{B974A465-1912-4E4A-ADA6-B2BAF9DDE89D} = {B1578203-268C-45C3-B62C-3D5CFC340AB4}
 		{93655DA5-BC50-4F07-85B3-509076003CBD} = {B1578203-268C-45C3-B62C-3D5CFC340AB4}
+		{79A27ACF-3616-4F3A-912A-85B066CAFBB7} = {B1578203-268C-45C3-B62C-3D5CFC340AB4}
 		{6861E718-D940-4E2A-A2EC-CB4F2EB68848} = {B1578203-268C-45C3-B62C-3D5CFC340AB4}
 		{04FB7C63-ACEF-41F4-98E4-35F5635B4D73} = {B1578203-268C-45C3-B62C-3D5CFC340AB4}
 		{635C575E-2759-4F37-A7CA-2A51BDCC84C5} = {B1578203-268C-45C3-B62C-3D5CFC340AB4}
+		{AD3D11F1-8E50-4728-9ADE-90CFC857852C} = {B57846B6-4EB4-475F-AF4D-A4317F6B7754}
+		{FA3CC022-8C7A-4F25-B3E5-55807B2B52C2} = {B57846B6-4EB4-475F-AF4D-A4317F6B7754}
+		{B57846B6-4EB4-475F-AF4D-A4317F6B7754} = {48EC3A74-596C-4075-A2E6-D73B2360DB14}
+		{EEA44216-44E1-4D42-85E0-50667F4F1372} = {A3955AC6-1263-49DE-9D9A-85B0C58A4DBF}
+		{5A2C5964-E515-47DD-B605-263FDD0FFA9C} = {A3955AC6-1263-49DE-9D9A-85B0C58A4DBF}
+		{A3955AC6-1263-49DE-9D9A-85B0C58A4DBF} = {48EC3A74-596C-4075-A2E6-D73B2360DB14}
+		{EC051CA0-5FE0-4E40-AEB8-53DE784FCC3E} = {D3C33399-9FC9-4F62-9883-D6D338D0233B}
+		{D3C33399-9FC9-4F62-9883-D6D338D0233B} = {48EC3A74-596C-4075-A2E6-D73B2360DB14}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4842DEC4-687D-48D9-B1FE-FF5456C0B60B}
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln b/src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln
index c4160dc5a83b4..7704349e524f2 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
@@ -29,6 +29,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Loggin
 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.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{618F18BC-549D-4DAA-8551-3726CCA9A478}"
+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}"
@@ -55,12 +57,30 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{A58AB418-69E1-41C8-A8DD-257924073646}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{33358624-4070-44F4-8F87-0C1ADE0C45B9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{1EF5F352-80CE-43C7-9D64-84E9093B977B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{5BBAD765-61AC-4B0C-8622-F69025B151CF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{D4E79343-CF72-43B4-A321-AE58ADEA91B1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{3B773172-E0CC-405B-83D6-4A314838F718}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{677D11A9-4811-41EA-8F93-F8DB15BF27DD}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{16797022-28AE-4250-970B-7A27D77C97FD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D782F54C-7681-4A49-ACE6-6A68C9833973}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{3C843288-881E-47C8-AFE4-5E27CFAE1F90}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{225E0292-CAF3-4173-939F-843D6C99684F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -127,6 +147,10 @@ Global
 		{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
+		{618F18BC-549D-4DAA-8551-3726CCA9A478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{618F18BC-549D-4DAA-8551-3726CCA9A478}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{618F18BC-549D-4DAA-8551-3726CCA9A478}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{618F18BC-549D-4DAA-8551-3726CCA9A478}.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
@@ -179,6 +203,26 @@ Global
 		{A58AB418-69E1-41C8-A8DD-257924073646}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A58AB418-69E1-41C8-A8DD-257924073646}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A58AB418-69E1-41C8-A8DD-257924073646}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33358624-4070-44F4-8F87-0C1ADE0C45B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33358624-4070-44F4-8F87-0C1ADE0C45B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33358624-4070-44F4-8F87-0C1ADE0C45B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33358624-4070-44F4-8F87-0C1ADE0C45B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EF5F352-80CE-43C7-9D64-84E9093B977B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EF5F352-80CE-43C7-9D64-84E9093B977B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EF5F352-80CE-43C7-9D64-84E9093B977B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1EF5F352-80CE-43C7-9D64-84E9093B977B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BBAD765-61AC-4B0C-8622-F69025B151CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BBAD765-61AC-4B0C-8622-F69025B151CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BBAD765-61AC-4B0C-8622-F69025B151CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BBAD765-61AC-4B0C-8622-F69025B151CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4E79343-CF72-43B4-A321-AE58ADEA91B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4E79343-CF72-43B4-A321-AE58ADEA91B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4E79343-CF72-43B4-A321-AE58ADEA91B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4E79343-CF72-43B4-A321-AE58ADEA91B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B773172-E0CC-405B-83D6-4A314838F718}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B773172-E0CC-405B-83D6-4A314838F718}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B773172-E0CC-405B-83D6-4A314838F718}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B773172-E0CC-405B-83D6-4A314838F718}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -209,9 +253,18 @@ Global
 		{2F5646F6-8247-42E5-ACF5-8732ACB7067A} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD}
 		{AA692D58-2C6C-4307-A13F-0884B6164026} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD}
 		{4F09A07F-70C7-4288-A6F3-EFBD5306E1F7} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD}
+		{618F18BC-549D-4DAA-8551-3726CCA9A478} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD}
 		{F47FCBE9-78EB-40FE-B2F9-3D5DD4BDF9DF} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD}
 		{7D8210EC-014D-4901-97D4-0C8AC919804E} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD}
 		{82D7CA6B-8647-49A1-B4A1-40A8C6B9D7C2} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD}
+		{33358624-4070-44F4-8F87-0C1ADE0C45B9} = {16797022-28AE-4250-970B-7A27D77C97FD}
+		{1EF5F352-80CE-43C7-9D64-84E9093B977B} = {16797022-28AE-4250-970B-7A27D77C97FD}
+		{16797022-28AE-4250-970B-7A27D77C97FD} = {225E0292-CAF3-4173-939F-843D6C99684F}
+		{5BBAD765-61AC-4B0C-8622-F69025B151CF} = {D782F54C-7681-4A49-ACE6-6A68C9833973}
+		{D4E79343-CF72-43B4-A321-AE58ADEA91B1} = {D782F54C-7681-4A49-ACE6-6A68C9833973}
+		{D782F54C-7681-4A49-ACE6-6A68C9833973} = {225E0292-CAF3-4173-939F-843D6C99684F}
+		{3B773172-E0CC-405B-83D6-4A314838F718} = {3C843288-881E-47C8-AFE4-5E27CFAE1F90}
+		{3C843288-881E-47C8-AFE4-5E27CFAE1F90} = {225E0292-CAF3-4173-939F-843D6C99684F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {88E9AE9C-34A3-4853-8244-9158CC50902D}
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln b/src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln
index 4d6252d76b276..6580e0272562f 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
@@ -33,6 +33,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Loggin
 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.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{97074CAA-5BD7-41F3-8E99-D6D405A3D5EA}"
+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}"
@@ -73,6 +75,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{421CAC3B-0778-481F-8F4F-9448FE06B21B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{C4E92A10-CD1A-4D3F-A80F-C7528191CFDD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{C388A006-2F94-4E56-8504-B9D15C8713E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{167F0F24-9BDC-45CA-B349-FDE922363367}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{3C1D15F2-0A7D-4130-B649-58B4DFA09D4D}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AFF4CCE7-94BD-42B0-8310-8D4CD00F18D3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5A06587C-82E8-4B40-9C0A-DD06CB986625}"
@@ -81,6 +93,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{887BF6A4-CB2
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{590E1BD9-E5AD-456B-B954-E26EA0BFE405}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{98D7969E-7743-4E1C-9AC0-BC69D3C3077D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{F0B21609-F6B0-42AD-A307-69E4CD6B5110}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{372A905D-3C3E-4A93-A052-38FB7B9E7E15}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{20D789C5-A75B-4A2D-914E-16D9E7BF51C8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -155,6 +175,10 @@ Global
 		{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
+		{97074CAA-5BD7-41F3-8E99-D6D405A3D5EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97074CAA-5BD7-41F3-8E99-D6D405A3D5EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97074CAA-5BD7-41F3-8E99-D6D405A3D5EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97074CAA-5BD7-41F3-8E99-D6D405A3D5EA}.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
@@ -235,6 +259,26 @@ Global
 		{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
+		{421CAC3B-0778-481F-8F4F-9448FE06B21B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{421CAC3B-0778-481F-8F4F-9448FE06B21B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{421CAC3B-0778-481F-8F4F-9448FE06B21B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{421CAC3B-0778-481F-8F4F-9448FE06B21B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4E92A10-CD1A-4D3F-A80F-C7528191CFDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4E92A10-CD1A-4D3F-A80F-C7528191CFDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4E92A10-CD1A-4D3F-A80F-C7528191CFDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4E92A10-CD1A-4D3F-A80F-C7528191CFDD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C388A006-2F94-4E56-8504-B9D15C8713E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C388A006-2F94-4E56-8504-B9D15C8713E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C388A006-2F94-4E56-8504-B9D15C8713E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C388A006-2F94-4E56-8504-B9D15C8713E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{167F0F24-9BDC-45CA-B349-FDE922363367}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{167F0F24-9BDC-45CA-B349-FDE922363367}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{167F0F24-9BDC-45CA-B349-FDE922363367}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{167F0F24-9BDC-45CA-B349-FDE922363367}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C1D15F2-0A7D-4130-B649-58B4DFA09D4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C1D15F2-0A7D-4130-B649-58B4DFA09D4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C1D15F2-0A7D-4130-B649-58B4DFA09D4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C1D15F2-0A7D-4130-B649-58B4DFA09D4D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -271,12 +315,21 @@ Global
 		{332D5122-9FA6-41D5-ACDC-9EF680961C31} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
 		{9E6D88B5-926D-494D-BC52-A429EFBF419F} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
 		{1201F595-5DD2-400E-B707-16C215E39FF9} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
+		{97074CAA-5BD7-41F3-8E99-D6D405A3D5EA} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
 		{EBF082B5-11B0-4514-BC86-F1D009382F90} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
 		{05F7A599-FAFB-4F24-ABB5-548219FF6492} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
 		{F722EACC-BB4F-4A88-B833-BB931E20CFCD} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
 		{62AECDFA-699B-41B0-AE5F-4B7D5D8F26B1} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
 		{4280A906-80BD-406D-A591-B3C58B2BD72C} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
 		{07C1E9F5-4FAD-4E03-8E14-BD6476561CF3} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
+		{421CAC3B-0778-481F-8F4F-9448FE06B21B} = {98D7969E-7743-4E1C-9AC0-BC69D3C3077D}
+		{C4E92A10-CD1A-4D3F-A80F-C7528191CFDD} = {98D7969E-7743-4E1C-9AC0-BC69D3C3077D}
+		{98D7969E-7743-4E1C-9AC0-BC69D3C3077D} = {20D789C5-A75B-4A2D-914E-16D9E7BF51C8}
+		{C388A006-2F94-4E56-8504-B9D15C8713E8} = {F0B21609-F6B0-42AD-A307-69E4CD6B5110}
+		{167F0F24-9BDC-45CA-B349-FDE922363367} = {F0B21609-F6B0-42AD-A307-69E4CD6B5110}
+		{F0B21609-F6B0-42AD-A307-69E4CD6B5110} = {20D789C5-A75B-4A2D-914E-16D9E7BF51C8}
+		{3C1D15F2-0A7D-4130-B649-58B4DFA09D4D} = {372A905D-3C3E-4A93-A052-38FB7B9E7E15}
+		{372A905D-3C3E-4A93-A052-38FB7B9E7E15} = {20D789C5-A75B-4A2D-914E-16D9E7BF51C8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {67B715CE-2E67-4605-BFB0-CA65F345C3A5}
diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln b/src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln
index 69282f77cfb17..f476f5edfb7e7 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
@@ -29,6 +29,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Loggin
 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.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{A78E92E0-2B40-422E-A77B-E94ADE714502}"
+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}"
@@ -49,12 +51,30 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{4A46E882-070F-4EE6-B0BF-67CC1609B9D7}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{0DE6DDCB-D85C-42C3-A2C5-7DA1609CB216}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{71B91EA8-DA26-4B39-9545-52190FBA633D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{281E65FE-6C80-4051-A5A1-D762463B20F2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{55C8C54F-1661-4B41-9D98-DD6DEABD4483}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{BA16D62A-70ED-4A22-A05A-243CA692FBD2}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C9FA428B-8564-4791-8CBF-2438F4783124}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E852D5A7-219C-4E2B-A327-6C6B988E65FC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{05ABF419-55CC-431B-845C-9899458A3DC5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{96C73C16-CDE9-4C23-A9E6-C22465829774}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{7626EEF9-BA57-4B2B-B6E7-1D740442A732}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{6FA64FDC-D2DB-43E4-82EC-74CBAA042BD1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -121,6 +141,10 @@ Global
 		{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
+		{A78E92E0-2B40-422E-A77B-E94ADE714502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A78E92E0-2B40-422E-A77B-E94ADE714502}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A78E92E0-2B40-422E-A77B-E94ADE714502}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A78E92E0-2B40-422E-A77B-E94ADE714502}.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
@@ -161,6 +185,26 @@ Global
 		{4A46E882-070F-4EE6-B0BF-67CC1609B9D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4A46E882-070F-4EE6-B0BF-67CC1609B9D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A46E882-070F-4EE6-B0BF-67CC1609B9D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DE6DDCB-D85C-42C3-A2C5-7DA1609CB216}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DE6DDCB-D85C-42C3-A2C5-7DA1609CB216}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DE6DDCB-D85C-42C3-A2C5-7DA1609CB216}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DE6DDCB-D85C-42C3-A2C5-7DA1609CB216}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71B91EA8-DA26-4B39-9545-52190FBA633D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71B91EA8-DA26-4B39-9545-52190FBA633D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71B91EA8-DA26-4B39-9545-52190FBA633D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71B91EA8-DA26-4B39-9545-52190FBA633D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{281E65FE-6C80-4051-A5A1-D762463B20F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{281E65FE-6C80-4051-A5A1-D762463B20F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{281E65FE-6C80-4051-A5A1-D762463B20F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{281E65FE-6C80-4051-A5A1-D762463B20F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55C8C54F-1661-4B41-9D98-DD6DEABD4483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55C8C54F-1661-4B41-9D98-DD6DEABD4483}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55C8C54F-1661-4B41-9D98-DD6DEABD4483}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55C8C54F-1661-4B41-9D98-DD6DEABD4483}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA16D62A-70ED-4A22-A05A-243CA692FBD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA16D62A-70ED-4A22-A05A-243CA692FBD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA16D62A-70ED-4A22-A05A-243CA692FBD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA16D62A-70ED-4A22-A05A-243CA692FBD2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -188,9 +232,18 @@ Global
 		{B3511D68-4F4C-4632-B993-649BCF73DE46} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC}
 		{D9B7AD79-A748-4D4F-9CF8-AB65D848085D} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC}
 		{7B81FBBF-6DC2-4854-990F-0D4394E00A8A} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC}
+		{A78E92E0-2B40-422E-A77B-E94ADE714502} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC}
 		{FC7A7BE7-332C-4970-8744-50CCBABAF0F4} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC}
 		{F5F7EA6D-5CBB-4711-8B79-17AF857DE2AC} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC}
 		{4559571A-68B4-40DD-B22F-76D6E06683EB} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC}
+		{0DE6DDCB-D85C-42C3-A2C5-7DA1609CB216} = {05ABF419-55CC-431B-845C-9899458A3DC5}
+		{71B91EA8-DA26-4B39-9545-52190FBA633D} = {05ABF419-55CC-431B-845C-9899458A3DC5}
+		{05ABF419-55CC-431B-845C-9899458A3DC5} = {6FA64FDC-D2DB-43E4-82EC-74CBAA042BD1}
+		{281E65FE-6C80-4051-A5A1-D762463B20F2} = {96C73C16-CDE9-4C23-A9E6-C22465829774}
+		{55C8C54F-1661-4B41-9D98-DD6DEABD4483} = {96C73C16-CDE9-4C23-A9E6-C22465829774}
+		{96C73C16-CDE9-4C23-A9E6-C22465829774} = {6FA64FDC-D2DB-43E4-82EC-74CBAA042BD1}
+		{BA16D62A-70ED-4A22-A05A-243CA692FBD2} = {7626EEF9-BA57-4B2B-B6E7-1D740442A732}
+		{7626EEF9-BA57-4B2B-B6E7-1D740442A732} = {6FA64FDC-D2DB-43E4-82EC-74CBAA042BD1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3375EACB-CFC1-4E7B-8A64-C346BD35E354}
diff --git a/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln b/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln
index 477181406d46e..46e50f957ce78 100644
--- a/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln
+++ b/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln
@@ -89,6 +89,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Option
 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.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{D5F7EDA2-2AA7-4598-AB90-45065C0FD0E2}"
+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}"
@@ -135,6 +137,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 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}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{DEFD9E94-9CC5-4809-AA49-E6CBE529ED67}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{0B8BE486-3926-4371-A292-7739E6232614}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{238EA941-009B-4DC8-9566-A66C30A78F7B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{33A6822A-D1EC-440D-99E1-C43615C33B5A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{E5F2D216-04F6-4851-925E-5387EF12BFEE}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5C4849A9-0DE8-4184-85B0-11FC5A0833A9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}"
@@ -143,6 +155,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D8928AB2-293
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BCF59319-979C-42FA-9B5E-19EFCC91D288}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{B4CF32E8-EF3E-45F0-A9B6-E1BE262A3141}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{0F09DCDA-7E65-4E01-A59D-FB214455B335}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{CD32BF8E-747B-42A3-B806-C7BB15533000}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{5C0E15B5-607F-4BCD-BC07-FC59C0FC38D1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -329,6 +349,10 @@ Global
 		{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
+		{D5F7EDA2-2AA7-4598-AB90-45065C0FD0E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5F7EDA2-2AA7-4598-AB90-45065C0FD0E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5F7EDA2-2AA7-4598-AB90-45065C0FD0E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D5F7EDA2-2AA7-4598-AB90-45065C0FD0E2}.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
@@ -421,6 +445,26 @@ Global
 		{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
+		{DEFD9E94-9CC5-4809-AA49-E6CBE529ED67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEFD9E94-9CC5-4809-AA49-E6CBE529ED67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEFD9E94-9CC5-4809-AA49-E6CBE529ED67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEFD9E94-9CC5-4809-AA49-E6CBE529ED67}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B8BE486-3926-4371-A292-7739E6232614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B8BE486-3926-4371-A292-7739E6232614}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B8BE486-3926-4371-A292-7739E6232614}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B8BE486-3926-4371-A292-7739E6232614}.Release|Any CPU.Build.0 = Release|Any CPU
+		{238EA941-009B-4DC8-9566-A66C30A78F7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{238EA941-009B-4DC8-9566-A66C30A78F7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{238EA941-009B-4DC8-9566-A66C30A78F7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{238EA941-009B-4DC8-9566-A66C30A78F7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33A6822A-D1EC-440D-99E1-C43615C33B5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33A6822A-D1EC-440D-99E1-C43615C33B5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33A6822A-D1EC-440D-99E1-C43615C33B5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33A6822A-D1EC-440D-99E1-C43615C33B5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5F2D216-04F6-4851-925E-5387EF12BFEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5F2D216-04F6-4851-925E-5387EF12BFEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5F2D216-04F6-4851-925E-5387EF12BFEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5F2D216-04F6-4851-925E-5387EF12BFEE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -488,12 +532,21 @@ Global
 		{765ABDD6-8C3B-4CD8-9DAC-BE9DAB674726} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
 		{95CB49D4-0754-49C6-8E97-868626614390} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
 		{E1519A2D-BBC6-4C15-BCAA-6B42EBE6FB0A} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
+		{D5F7EDA2-2AA7-4598-AB90-45065C0FD0E2} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
 		{CDA036E5-80B8-4854-81ED-4664E203B0D0} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
 		{7268FF18-CAB4-4BC8-A767-161033C9D0BB} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
 		{2CBBB613-7A47-495A-839D-76824F6C2100} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
 		{C1557157-7D8E-43A3-89D1-9F4F2621D838} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
 		{D8001B54-0361-40B9-A094-13063C5CF9A3} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
 		{502417D7-C385-4490-BB0F-920900DA8C9E} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
+		{DEFD9E94-9CC5-4809-AA49-E6CBE529ED67} = {B4CF32E8-EF3E-45F0-A9B6-E1BE262A3141}
+		{0B8BE486-3926-4371-A292-7739E6232614} = {B4CF32E8-EF3E-45F0-A9B6-E1BE262A3141}
+		{B4CF32E8-EF3E-45F0-A9B6-E1BE262A3141} = {5C0E15B5-607F-4BCD-BC07-FC59C0FC38D1}
+		{238EA941-009B-4DC8-9566-A66C30A78F7B} = {0F09DCDA-7E65-4E01-A59D-FB214455B335}
+		{33A6822A-D1EC-440D-99E1-C43615C33B5A} = {0F09DCDA-7E65-4E01-A59D-FB214455B335}
+		{0F09DCDA-7E65-4E01-A59D-FB214455B335} = {5C0E15B5-607F-4BCD-BC07-FC59C0FC38D1}
+		{E5F2D216-04F6-4851-925E-5387EF12BFEE} = {CD32BF8E-747B-42A3-B806-C7BB15533000}
+		{CD32BF8E-747B-42A3-B806-C7BB15533000} = {5C0E15B5-607F-4BCD-BC07-FC59C0FC38D1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B57B7C13-740F-4482-B7B6-B5E87014ACB1}
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 47792933bec7e..15e486ef59988 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,5 +1,4 @@
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{12321E9E-FB5F-4D8C-8F9A-C03E1862EF8B}"
@@ -32,6 +31,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Option
 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.SourceGeneration.Tests", "tests\SourceGenerationTests\Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj", "{A30F67CA-BDBF-4C1F-92F5-C41967C02F24}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions.UnitTests", "tests\UnitTests\Microsoft.Extensions.Options.ConfigurationExtensions.UnitTests.csproj", "{2F5EC71C-0F0C-49AE-ADD8-42753384D91F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{13292F01-310D-434D-BC4D-7E102ABE17BB}"
+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}"
@@ -40,12 +45,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{616C55BF-AE90-47F2-A005-980CADDBD990}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{A4F07FE2-F9C0-400D-A5A5-EF9A24407593}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{69B3A343-3883-4F35-8B8A-2A126A9B0762}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9621BAB7-9AFF-4CAD-BFFF-B6BC1341155C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{0E0027B4-8633-40E0-BB3C-6A09BA077006}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{32F49285-E4F8-486F-AF11-323D963878F5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{DF497533-79F3-46AB-9A1D-B7899A70385E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{183A92AF-23BC-4BAC-821D-152B5B22E6BA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{C7BF47CB-D4A1-42C6-B0F2-4C84850C7080}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3467065B-1F80-427C-81C1-09114914817F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1FFB0A3C-B679-431A-B36B-123EE6166D14}"
@@ -54,9 +67,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E6347567-2D2
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F4006304-5C88-478E-A93C-621D71A5097F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Extensions.Options.ConfigurationExtensions.UnitTests", "tests\UnitTests\Microsoft.Extensions.Options.ConfigurationExtensions.UnitTests.csproj", "{2F5EC71C-0F0C-49AE-ADD8-42753384D91F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{29852EC8-54F4-4C93-A9AA-D86D2B532042}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{803A30F9-9A35-41E7-8204-C53DEE990987}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests", "tests\SourceGenerationTests\Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj", "{A30F67CA-BDBF-4C1F-92F5-C41967C02F24}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{021C6847-732A-4B75-BE9A-97C5DBEE63BE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{5BBFEB3E-A06E-4282-AF60-E1BCBB6D1966}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -128,6 +145,18 @@ Global
 		{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
+		{A30F67CA-BDBF-4C1F-92F5-C41967C02F24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A30F67CA-BDBF-4C1F-92F5-C41967C02F24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A30F67CA-BDBF-4C1F-92F5-C41967C02F24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A30F67CA-BDBF-4C1F-92F5-C41967C02F24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F5EC71C-0F0C-49AE-ADD8-42753384D91F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F5EC71C-0F0C-49AE-ADD8-42753384D91F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F5EC71C-0F0C-49AE-ADD8-42753384D91F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F5EC71C-0F0C-49AE-ADD8-42753384D91F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13292F01-310D-434D-BC4D-7E102ABE17BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13292F01-310D-434D-BC4D-7E102ABE17BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13292F01-310D-434D-BC4D-7E102ABE17BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13292F01-310D-434D-BC4D-7E102ABE17BB}.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
@@ -144,10 +173,6 @@ Global
 		{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
-		{A4F07FE2-F9C0-400D-A5A5-EF9A24407593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4F07FE2-F9C0-400D-A5A5-EF9A24407593}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4F07FE2-F9C0-400D-A5A5-EF9A24407593}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4F07FE2-F9C0-400D-A5A5-EF9A24407593}.Release|Any CPU.Build.0 = Release|Any CPU
 		{69B3A343-3883-4F35-8B8A-2A126A9B0762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{69B3A343-3883-4F35-8B8A-2A126A9B0762}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{69B3A343-3883-4F35-8B8A-2A126A9B0762}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -156,24 +181,34 @@ Global
 		{9621BAB7-9AFF-4CAD-BFFF-B6BC1341155C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9621BAB7-9AFF-4CAD-BFFF-B6BC1341155C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9621BAB7-9AFF-4CAD-BFFF-B6BC1341155C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D3A3D75-D40C-4FAB-8F39-23B90A6FD1EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D3A3D75-D40C-4FAB-8F39-23B90A6FD1EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D3A3D75-D40C-4FAB-8F39-23B90A6FD1EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3D3A3D75-D40C-4FAB-8F39-23B90A6FD1EB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2F5EC71C-0F0C-49AE-ADD8-42753384D91F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F5EC71C-0F0C-49AE-ADD8-42753384D91F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2F5EC71C-0F0C-49AE-ADD8-42753384D91F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2F5EC71C-0F0C-49AE-ADD8-42753384D91F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A30F67CA-BDBF-4C1F-92F5-C41967C02F24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A30F67CA-BDBF-4C1F-92F5-C41967C02F24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A30F67CA-BDBF-4C1F-92F5-C41967C02F24}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A30F67CA-BDBF-4C1F-92F5-C41967C02F24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E0027B4-8633-40E0-BB3C-6A09BA077006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E0027B4-8633-40E0-BB3C-6A09BA077006}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E0027B4-8633-40E0-BB3C-6A09BA077006}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E0027B4-8633-40E0-BB3C-6A09BA077006}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32F49285-E4F8-486F-AF11-323D963878F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32F49285-E4F8-486F-AF11-323D963878F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32F49285-E4F8-486F-AF11-323D963878F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32F49285-E4F8-486F-AF11-323D963878F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF497533-79F3-46AB-9A1D-B7899A70385E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF497533-79F3-46AB-9A1D-B7899A70385E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF497533-79F3-46AB-9A1D-B7899A70385E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF497533-79F3-46AB-9A1D-B7899A70385E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{183A92AF-23BC-4BAC-821D-152B5B22E6BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{183A92AF-23BC-4BAC-821D-152B5B22E6BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{183A92AF-23BC-4BAC-821D-152B5B22E6BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{183A92AF-23BC-4BAC-821D-152B5B22E6BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7BF47CB-D4A1-42C6-B0F2-4C84850C7080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7BF47CB-D4A1-42C6-B0F2-4C84850C7080}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7BF47CB-D4A1-42C6-B0F2-4C84850C7080}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7BF47CB-D4A1-42C6-B0F2-4C84850C7080}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{E6903177-761B-4A40-BD67-85095C73119D} = {3467065B-1F80-427C-81C1-09114914817F}
+		{A30F67CA-BDBF-4C1F-92F5-C41967C02F24} = {3467065B-1F80-427C-81C1-09114914817F}
+		{2F5EC71C-0F0C-49AE-ADD8-42753384D91F} = {3467065B-1F80-427C-81C1-09114914817F}
 		{12321E9E-FB5F-4D8C-8F9A-C03E1862EF8B} = {1FFB0A3C-B679-431A-B36B-123EE6166D14}
 		{871819C7-366E-47E9-B737-ADB9715B0BCA} = {1FFB0A3C-B679-431A-B36B-123EE6166D14}
 		{3C53F87D-1638-4F8B-99E0-5FDA13A5AEC2} = {1FFB0A3C-B679-431A-B36B-123EE6166D14}
@@ -193,12 +228,17 @@ Global
 		{AAB799C3-8D63-4334-A9AE-D645EC848174} = {E6347567-2D24-4E99-8F15-3657FF95AB6D}
 		{616C55BF-AE90-47F2-A005-980CADDBD990} = {E6347567-2D24-4E99-8F15-3657FF95AB6D}
 		{8F355290-0867-40A2-8F92-E9A3C5F5BAAF} = {F4006304-5C88-478E-A93C-621D71A5097F}
-		{A4F07FE2-F9C0-400D-A5A5-EF9A24407593} = {F4006304-5C88-478E-A93C-621D71A5097F}
+		{13292F01-310D-434D-BC4D-7E102ABE17BB} = {F4006304-5C88-478E-A93C-621D71A5097F}
 		{69B3A343-3883-4F35-8B8A-2A126A9B0762} = {F4006304-5C88-478E-A93C-621D71A5097F}
 		{9621BAB7-9AFF-4CAD-BFFF-B6BC1341155C} = {F4006304-5C88-478E-A93C-621D71A5097F}
-		{3D3A3D75-D40C-4FAB-8F39-23B90A6FD1EB} = {3467065B-1F80-427C-81C1-09114914817F}
-		{2F5EC71C-0F0C-49AE-ADD8-42753384D91F} = {3467065B-1F80-427C-81C1-09114914817F}
-		{A30F67CA-BDBF-4C1F-92F5-C41967C02F24} = {3467065B-1F80-427C-81C1-09114914817F}
+		{0E0027B4-8633-40E0-BB3C-6A09BA077006} = {29852EC8-54F4-4C93-A9AA-D86D2B532042}
+		{32F49285-E4F8-486F-AF11-323D963878F5} = {29852EC8-54F4-4C93-A9AA-D86D2B532042}
+		{29852EC8-54F4-4C93-A9AA-D86D2B532042} = {5BBFEB3E-A06E-4282-AF60-E1BCBB6D1966}
+		{DF497533-79F3-46AB-9A1D-B7899A70385E} = {803A30F9-9A35-41E7-8204-C53DEE990987}
+		{183A92AF-23BC-4BAC-821D-152B5B22E6BA} = {803A30F9-9A35-41E7-8204-C53DEE990987}
+		{803A30F9-9A35-41E7-8204-C53DEE990987} = {5BBFEB3E-A06E-4282-AF60-E1BCBB6D1966}
+		{C7BF47CB-D4A1-42C6-B0F2-4C84850C7080} = {021C6847-732A-4B75-BE9A-97C5DBEE63BE}
+		{021C6847-732A-4B75-BE9A-97C5DBEE63BE} = {5BBFEB3E-A06E-4282-AF60-E1BCBB6D1966}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3A661B81-588D-49A6-A245-E9B7EA9C3FE4}
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 d715b3d075d4c..9c550cb81b04f 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
@@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Option
 EndProject
 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.SourceGeneration", "..\Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{AE2D1BFD-FD06-4227-98A7-14604F9D0EFC}"
+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}"
@@ -19,18 +21,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{065B4B16-B618-41D8-B1DE-F31AFC9E6C84}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{E0E82350-04CF-40E3-AE98-54F5F7F55F6E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{47E4AB7D-BC64-4323-B723-CD2B7DA9BB88}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{BBFDDC90-8F98-4DD7-8A18-8E2345C18904}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{78B102D5-FBC0-4304-B14D-D6CFF50A30DA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{D7C772DD-9024-422B-BFBF-BB1F943FC50F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{5DA74E5E-D6D2-4B8C-A628-F71F752764B5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{43AC8A36-3FA3-4756-B373-6D3A4BE66E6E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{C4BCAFFB-8697-47CA-9BAF-7834E4785C56}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DE5517CB-9721-49A0-9ECB-BC08460946AC}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5B543880-D43D-48B8-9C46-CEE391D03B73}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{237F45C3-B835-4C47-A298-604D5BFC60DC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{7BBDC2A5-AD5A-49CC-B548-F1E2BC4B192C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C02550C2-AE19-4F57-B3A3-B46343F45433}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{B330B03E-004E-4696-91B0-0F8E2644AEE0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,6 +79,10 @@ Global
 		{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
+		{AE2D1BFD-FD06-4227-98A7-14604F9D0EFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE2D1BFD-FD06-4227-98A7-14604F9D0EFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE2D1BFD-FD06-4227-98A7-14604F9D0EFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE2D1BFD-FD06-4227-98A7-14604F9D0EFC}.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
@@ -77,10 +99,6 @@ Global
 		{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
-		{E0E82350-04CF-40E3-AE98-54F5F7F55F6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0E82350-04CF-40E3-AE98-54F5F7F55F6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0E82350-04CF-40E3-AE98-54F5F7F55F6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0E82350-04CF-40E3-AE98-54F5F7F55F6E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{47E4AB7D-BC64-4323-B723-CD2B7DA9BB88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{47E4AB7D-BC64-4323-B723-CD2B7DA9BB88}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47E4AB7D-BC64-4323-B723-CD2B7DA9BB88}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -89,6 +107,26 @@ Global
 		{BBFDDC90-8F98-4DD7-8A18-8E2345C18904}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BBFDDC90-8F98-4DD7-8A18-8E2345C18904}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BBFDDC90-8F98-4DD7-8A18-8E2345C18904}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78B102D5-FBC0-4304-B14D-D6CFF50A30DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78B102D5-FBC0-4304-B14D-D6CFF50A30DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78B102D5-FBC0-4304-B14D-D6CFF50A30DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78B102D5-FBC0-4304-B14D-D6CFF50A30DA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7C772DD-9024-422B-BFBF-BB1F943FC50F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7C772DD-9024-422B-BFBF-BB1F943FC50F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7C772DD-9024-422B-BFBF-BB1F943FC50F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7C772DD-9024-422B-BFBF-BB1F943FC50F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DA74E5E-D6D2-4B8C-A628-F71F752764B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DA74E5E-D6D2-4B8C-A628-F71F752764B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DA74E5E-D6D2-4B8C-A628-F71F752764B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5DA74E5E-D6D2-4B8C-A628-F71F752764B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43AC8A36-3FA3-4756-B373-6D3A4BE66E6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43AC8A36-3FA3-4756-B373-6D3A4BE66E6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43AC8A36-3FA3-4756-B373-6D3A4BE66E6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43AC8A36-3FA3-4756-B373-6D3A4BE66E6E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4BCAFFB-8697-47CA-9BAF-7834E4785C56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4BCAFFB-8697-47CA-9BAF-7834E4785C56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4BCAFFB-8697-47CA-9BAF-7834E4785C56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4BCAFFB-8697-47CA-9BAF-7834E4785C56}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -104,9 +142,17 @@ Global
 		{9022313F-BEEA-426E-8185-096E0516D1B6} = {A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6}
 		{72D4F48A-A93B-471F-B9C7-64BC9BF22A09} = {A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6}
 		{065B4B16-B618-41D8-B1DE-F31AFC9E6C84} = {A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6}
-		{E0E82350-04CF-40E3-AE98-54F5F7F55F6E} = {5B543880-D43D-48B8-9C46-CEE391D03B73}
+		{AE2D1BFD-FD06-4227-98A7-14604F9D0EFC} = {5B543880-D43D-48B8-9C46-CEE391D03B73}
 		{47E4AB7D-BC64-4323-B723-CD2B7DA9BB88} = {5B543880-D43D-48B8-9C46-CEE391D03B73}
 		{BBFDDC90-8F98-4DD7-8A18-8E2345C18904} = {5B543880-D43D-48B8-9C46-CEE391D03B73}
+		{78B102D5-FBC0-4304-B14D-D6CFF50A30DA} = {237F45C3-B835-4C47-A298-604D5BFC60DC}
+		{D7C772DD-9024-422B-BFBF-BB1F943FC50F} = {237F45C3-B835-4C47-A298-604D5BFC60DC}
+		{237F45C3-B835-4C47-A298-604D5BFC60DC} = {B330B03E-004E-4696-91B0-0F8E2644AEE0}
+		{5DA74E5E-D6D2-4B8C-A628-F71F752764B5} = {7BBDC2A5-AD5A-49CC-B548-F1E2BC4B192C}
+		{43AC8A36-3FA3-4756-B373-6D3A4BE66E6E} = {7BBDC2A5-AD5A-49CC-B548-F1E2BC4B192C}
+		{7BBDC2A5-AD5A-49CC-B548-F1E2BC4B192C} = {B330B03E-004E-4696-91B0-0F8E2644AEE0}
+		{C4BCAFFB-8697-47CA-9BAF-7834E4785C56} = {C02550C2-AE19-4F57-B3A3-B46343F45433}
+		{C02550C2-AE19-4F57-B3A3-B46343F45433} = {B330B03E-004E-4696-91B0-0F8E2644AEE0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {976CC898-9F51-4F78-825C-EF31520CD788}
diff --git a/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln b/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln
index 3935bd84d4004..f573db34f0304 100644
--- a/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln
+++ b/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln
@@ -47,6 +47,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
 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.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\ref\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{E0E112CC-3B5C-46AC-9541-D53BB36FB1E2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.Abstractions", "..\Microsoft.Extensions.Diagnostics.Abstractions\src\Microsoft.Extensions.Diagnostics.Abstractions.csproj", "{8E120FF0-27B9-4DE0-85FA-B0BE18867898}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\ref\Microsoft.Extensions.Diagnostics.csproj", "{EFDDE3C6-3CBC-480B-AA19-0C93913DB53A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics", "..\Microsoft.Extensions.Diagnostics\src\Microsoft.Extensions.Diagnostics.csproj", "{5E97D652-E1A3-46CF-B577-C1216A9FD079}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{05161D6B-0451-43B9-B648-71B7628F2A78}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{6A4A1183-A0CF-4270-8EF9-12018D9DADB9}"
@@ -109,12 +117,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Option
 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.SourceGeneration", "gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{2B8ED012-22B5-47DD-A879-FD2AFD4C067D}"
+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.SourceGeneration", "gen\Microsoft.Extensions.Options.SourceGeneration.csproj", "{2B8ED012-22B5-47DD-A879-FD2AFD4C067D}"
-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.Options.SourceGeneration.Unit.Tests", "tests\SourceGeneration.Unit.Tests\Microsoft.Extensions.Options.SourceGeneration.Unit.Tests.csproj", "{D3B6805B-F10E-4A19-99FC-55506892BC18}"
@@ -127,10 +135,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent", "..\System.Collections.Concurrent\ref\System.Collections.Concurrent.csproj", "{3CE1FDFB-3BFD-463E-AC82-4E5302F0AB2F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj", "{CF8F7B21-6C98-4390-8E94-653587E2B084}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\ref\System.Collections.csproj", "{6AE427EF-C018-4075-A4C8-BF3831C5F88C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Annotations", "..\System.ComponentModel.Annotations\ref\System.ComponentModel.Annotations.csproj", "{173C1D16-0E90-480C-8A37-0322F86F9B25}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Annotations", "..\System.ComponentModel.Annotations\src\System.ComponentModel.Annotations.csproj", "{90548F7B-C673-42C9-BD88-A6E6550ECE1C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Primitives", "..\System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj", "{90349C97-F971-47ED-B25C-E3379E317268}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.TypeConverter", "..\System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj", "{7D765777-8952-4728-AE5D-4493A5BC0C08}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel", "..\System.ComponentModel\ref\System.ComponentModel.csproj", "{51F8FF5B-9CC9-4205-BB61-A968962D917F}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{6A1A3AFF-C018-498A-80A0-532396132AD5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{429C9D71-4BBD-489D-9C86-EC240F652008}"
@@ -143,6 +161,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory", "..\System.Memory\ref\System.Memory.csproj", "{990280EA-CDBD-480A-8224-DBCBA8B6D6DB}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ObjectModel", "..\System.ObjectModel\ref\System.ObjectModel.csproj", "{00A79938-3E8B-430F-8F02-B1FD88CDF2E6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Writer", "..\System.Resources.Writer\ref\System.Resources.Writer.csproj", "{E71C107F-4371-4BCF-A387-3CAF90653173}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{62065BFE-5477-44DD-A328-582B0F050EC3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{02425B61-8D98-4F4A-88AE-F77D4837DF9E}"
@@ -165,6 +187,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{D7CEC738-5D2D-4FCB-9268-9650EB01BF31}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{87219539-82DC-4605-BFFA-69547203AEB3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{401090CE-81C8-4C6C-8F12-DF962AE8CB1C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{B21B1C26-B5FD-4A30-B8C9-69DE311B6F03}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{6D9421F9-E06A-4984-AD31-C587A6200CF7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{759C53AF-4A71-475D-96C1-418D99CF636F}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7C1317AA-5F4C-42A4-80F3-856BA5E204AF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{72A090A3-FE14-4F4E-B266-EFFB5C736462}"
@@ -173,6 +205,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7028EE0A-D31
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{EEA4A938-C9F5-45E5-BF34-AA10FFC34377}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{7B675C35-5AB4-45A8-A5DF-32A2B586C070}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C0B95665-ADCD-477C-83C5-8CF7FB2C9093}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{93E96311-7199-450E-B6DD-C295A09EA7AF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -275,6 +315,22 @@ Global
 		{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
+		{E0E112CC-3B5C-46AC-9541-D53BB36FB1E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0E112CC-3B5C-46AC-9541-D53BB36FB1E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0E112CC-3B5C-46AC-9541-D53BB36FB1E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0E112CC-3B5C-46AC-9541-D53BB36FB1E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E120FF0-27B9-4DE0-85FA-B0BE18867898}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E120FF0-27B9-4DE0-85FA-B0BE18867898}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E120FF0-27B9-4DE0-85FA-B0BE18867898}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E120FF0-27B9-4DE0-85FA-B0BE18867898}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EFDDE3C6-3CBC-480B-AA19-0C93913DB53A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFDDE3C6-3CBC-480B-AA19-0C93913DB53A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFDDE3C6-3CBC-480B-AA19-0C93913DB53A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFDDE3C6-3CBC-480B-AA19-0C93913DB53A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E97D652-E1A3-46CF-B577-C1216A9FD079}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E97D652-E1A3-46CF-B577-C1216A9FD079}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E97D652-E1A3-46CF-B577-C1216A9FD079}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E97D652-E1A3-46CF-B577-C1216A9FD079}.Release|Any CPU.Build.0 = Release|Any CPU
 		{05161D6B-0451-43B9-B648-71B7628F2A78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{05161D6B-0451-43B9-B648-71B7628F2A78}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{05161D6B-0451-43B9-B648-71B7628F2A78}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -399,6 +455,10 @@ Global
 		{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
+		{2B8ED012-22B5-47DD-A879-FD2AFD4C067D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B8ED012-22B5-47DD-A879-FD2AFD4C067D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B8ED012-22B5-47DD-A879-FD2AFD4C067D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B8ED012-22B5-47DD-A879-FD2AFD4C067D}.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
@@ -411,6 +471,14 @@ Global
 		{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
+		{D3B6805B-F10E-4A19-99FC-55506892BC18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3B6805B-F10E-4A19-99FC-55506892BC18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3B6805B-F10E-4A19-99FC-55506892BC18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3B6805B-F10E-4A19-99FC-55506892BC18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7C2C4C7-CF28-4E2B-8749-31D7E6072588}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7C2C4C7-CF28-4E2B-8749-31D7E6072588}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7C2C4C7-CF28-4E2B-8749-31D7E6072588}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7C2C4C7-CF28-4E2B-8749-31D7E6072588}.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
@@ -423,10 +491,34 @@ Global
 		{3CE1FDFB-3BFD-463E-AC82-4E5302F0AB2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3CE1FDFB-3BFD-463E-AC82-4E5302F0AB2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3CE1FDFB-3BFD-463E-AC82-4E5302F0AB2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF8F7B21-6C98-4390-8E94-653587E2B084}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF8F7B21-6C98-4390-8E94-653587E2B084}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF8F7B21-6C98-4390-8E94-653587E2B084}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF8F7B21-6C98-4390-8E94-653587E2B084}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6AE427EF-C018-4075-A4C8-BF3831C5F88C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6AE427EF-C018-4075-A4C8-BF3831C5F88C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6AE427EF-C018-4075-A4C8-BF3831C5F88C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6AE427EF-C018-4075-A4C8-BF3831C5F88C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{173C1D16-0E90-480C-8A37-0322F86F9B25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{173C1D16-0E90-480C-8A37-0322F86F9B25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{173C1D16-0E90-480C-8A37-0322F86F9B25}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{173C1D16-0E90-480C-8A37-0322F86F9B25}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90548F7B-C673-42C9-BD88-A6E6550ECE1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90548F7B-C673-42C9-BD88-A6E6550ECE1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90548F7B-C673-42C9-BD88-A6E6550ECE1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90548F7B-C673-42C9-BD88-A6E6550ECE1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90349C97-F971-47ED-B25C-E3379E317268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90349C97-F971-47ED-B25C-E3379E317268}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90349C97-F971-47ED-B25C-E3379E317268}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90349C97-F971-47ED-B25C-E3379E317268}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D765777-8952-4728-AE5D-4493A5BC0C08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D765777-8952-4728-AE5D-4493A5BC0C08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D765777-8952-4728-AE5D-4493A5BC0C08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D765777-8952-4728-AE5D-4493A5BC0C08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51F8FF5B-9CC9-4205-BB61-A968962D917F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51F8FF5B-9CC9-4205-BB61-A968962D917F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51F8FF5B-9CC9-4205-BB61-A968962D917F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51F8FF5B-9CC9-4205-BB61-A968962D917F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6A1A3AFF-C018-498A-80A0-532396132AD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A1A3AFF-C018-498A-80A0-532396132AD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A1A3AFF-C018-498A-80A0-532396132AD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -451,6 +543,14 @@ Global
 		{990280EA-CDBD-480A-8224-DBCBA8B6D6DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{990280EA-CDBD-480A-8224-DBCBA8B6D6DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{990280EA-CDBD-480A-8224-DBCBA8B6D6DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00A79938-3E8B-430F-8F02-B1FD88CDF2E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00A79938-3E8B-430F-8F02-B1FD88CDF2E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00A79938-3E8B-430F-8F02-B1FD88CDF2E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00A79938-3E8B-430F-8F02-B1FD88CDF2E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E71C107F-4371-4BCF-A387-3CAF90653173}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E71C107F-4371-4BCF-A387-3CAF90653173}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E71C107F-4371-4BCF-A387-3CAF90653173}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E71C107F-4371-4BCF-A387-3CAF90653173}.Release|Any CPU.Build.0 = Release|Any CPU
 		{62065BFE-5477-44DD-A328-582B0F050EC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{62065BFE-5477-44DD-A328-582B0F050EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{62065BFE-5477-44DD-A328-582B0F050EC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -495,22 +595,26 @@ Global
 		{D7CEC738-5D2D-4FCB-9268-9650EB01BF31}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D7CEC738-5D2D-4FCB-9268-9650EB01BF31}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D7CEC738-5D2D-4FCB-9268-9650EB01BF31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B8ED012-22B5-47DD-A879-FD2AFD4C067D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B8ED012-22B5-47DD-A879-FD2AFD4C067D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B8ED012-22B5-47DD-A879-FD2AFD4C067D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B8ED012-22B5-47DD-A879-FD2AFD4C067D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D3B6805B-F10E-4A19-99FC-55506892BC18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3B6805B-F10E-4A19-99FC-55506892BC18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3B6805B-F10E-4A19-99FC-55506892BC18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D3B6805B-F10E-4A19-99FC-55506892BC18}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7C2C4C7-CF28-4E2B-8749-31D7E6072588}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7C2C4C7-CF28-4E2B-8749-31D7E6072588}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7C2C4C7-CF28-4E2B-8749-31D7E6072588}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7C2C4C7-CF28-4E2B-8749-31D7E6072588}.Release|Any CPU.Build.0 = Release|Any CPU
-		{90548F7B-C673-42C9-BD88-A6E6550ECE1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90548F7B-C673-42C9-BD88-A6E6550ECE1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90548F7B-C673-42C9-BD88-A6E6550ECE1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90548F7B-C673-42C9-BD88-A6E6550ECE1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87219539-82DC-4605-BFFA-69547203AEB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87219539-82DC-4605-BFFA-69547203AEB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87219539-82DC-4605-BFFA-69547203AEB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87219539-82DC-4605-BFFA-69547203AEB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{401090CE-81C8-4C6C-8F12-DF962AE8CB1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{401090CE-81C8-4C6C-8F12-DF962AE8CB1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{401090CE-81C8-4C6C-8F12-DF962AE8CB1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{401090CE-81C8-4C6C-8F12-DF962AE8CB1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B21B1C26-B5FD-4A30-B8C9-69DE311B6F03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B21B1C26-B5FD-4A30-B8C9-69DE311B6F03}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B21B1C26-B5FD-4A30-B8C9-69DE311B6F03}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B21B1C26-B5FD-4A30-B8C9-69DE311B6F03}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D9421F9-E06A-4984-AD31-C587A6200CF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D9421F9-E06A-4984-AD31-C587A6200CF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D9421F9-E06A-4984-AD31-C587A6200CF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D9421F9-E06A-4984-AD31-C587A6200CF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{759C53AF-4A71-475D-96C1-418D99CF636F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{759C53AF-4A71-475D-96C1-418D99CF636F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{759C53AF-4A71-475D-96C1-418D99CF636F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{759C53AF-4A71-475D-96C1-418D99CF636F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -518,6 +622,8 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{F5A58A9D-3C44-4E3C-A661-1CECA84108D9} = {7C1317AA-5F4C-42A4-80F3-856BA5E204AF}
 		{94CAA850-ABDB-4A1E-B18B-19DA0DE75CFD} = {7C1317AA-5F4C-42A4-80F3-856BA5E204AF}
+		{D3B6805B-F10E-4A19-99FC-55506892BC18} = {7C1317AA-5F4C-42A4-80F3-856BA5E204AF}
+		{D7C2C4C7-CF28-4E2B-8749-31D7E6072588} = {7C1317AA-5F4C-42A4-80F3-856BA5E204AF}
 		{201C7D67-FB1D-4259-9DB4-BF188007F9EA} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{5EA013FF-FCA7-4F0B-8EB7-14D8472A0830} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{5E90DFC5-7D40-42E4-ADF6-7090015B7211} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
@@ -529,6 +635,8 @@ Global
 		{692645D6-1F0B-4DB0-85EB-7D4042857B2D} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{A29E2B35-847A-4304-BF0F-B0DFDC4384A1} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{AB7510FB-A8B8-426E-A5FB-D292F1423D5A} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
+		{E0E112CC-3B5C-46AC-9541-D53BB36FB1E2} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
+		{EFDDE3C6-3CBC-480B-AA19-0C93913DB53A} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{05161D6B-0451-43B9-B648-71B7628F2A78} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{92B8FC4A-A8B5-4799-831D-F82A4BE16B39} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{6F7512BA-9B15-4395-AE05-C546F0770344} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
@@ -546,10 +654,17 @@ Global
 		{D0CAEF2C-FB83-4C32-80BD-1F516AD13FAA} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{36C471D8-1D7A-4C81-8B05-2EED0984FBB4} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{3CE1FDFB-3BFD-463E-AC82-4E5302F0AB2F} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
+		{CF8F7B21-6C98-4390-8E94-653587E2B084} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{6AE427EF-C018-4075-A4C8-BF3831C5F88C} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
+		{173C1D16-0E90-480C-8A37-0322F86F9B25} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
+		{90349C97-F971-47ED-B25C-E3379E317268} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
+		{7D765777-8952-4728-AE5D-4493A5BC0C08} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
+		{51F8FF5B-9CC9-4205-BB61-A968962D917F} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{6A1A3AFF-C018-498A-80A0-532396132AD5} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{11773B90-8DAC-4B51-A4B6-7C64FD6942BD} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{990280EA-CDBD-480A-8224-DBCBA8B6D6DB} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
+		{00A79938-3E8B-430F-8F02-B1FD88CDF2E6} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
+		{E71C107F-4371-4BCF-A387-3CAF90653173} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{B0249028-C048-40B8-B102-BCE7928965C3} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{9F1389B4-A9A5-422F-89F5-A2D431292F0C} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
 		{6E2398EA-A64A-4493-A79B-63D2F072A690} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
@@ -564,6 +679,8 @@ Global
 		{D4256787-48E0-473F-8C06-359C1BCFC8AB} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
 		{0F2B84D6-6C2E-4216-A8CD-DF91908F4194} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
 		{250B3EA5-65A4-4D62-B0F9-5BAAFE53BD7A} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
+		{8E120FF0-27B9-4DE0-85FA-B0BE18867898} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
+		{5E97D652-E1A3-46CF-B577-C1216A9FD079} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
 		{6A4A1183-A0CF-4270-8EF9-12018D9DADB9} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
 		{3C56A02F-4DD8-4253-99E7-34E088A6A9D7} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
 		{36D778AF-5EC3-433F-B03D-EB244DB3C227} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
@@ -580,6 +697,7 @@ Global
 		{3A6E2FA4-B745-4E4B-A82E-98CAD1177E77} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
 		{9BA945E7-0970-4CA2-A54B-F8D9B3E69917} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
 		{AAB5D437-EFB2-4BAC-BA0F-7323BA691B89} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
+		{90548F7B-C673-42C9-BD88-A6E6550ECE1C} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
 		{429C9D71-4BBD-489D-9C86-EC240F652008} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
 		{99007CDD-4840-4B94-8A8A-FECF72BCEE3F} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
 		{9175023F-6982-45CD-B360-C4FC1E145B25} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
@@ -589,16 +707,21 @@ Global
 		{39EE5D71-77C5-4633-A47F-1062172FD121} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
 		{8A4E7CB4-9983-4B7F-BED9-7A94BAC7CA07} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
 		{333116ED-7874-4ECD-91EC-641B8479F696} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
+		{2B8ED012-22B5-47DD-A879-FD2AFD4C067D} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
 		{62065BFE-5477-44DD-A328-582B0F050EC3} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
 		{02425B61-8D98-4F4A-88AE-F77D4837DF9E} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
 		{E0460280-2F49-474C-862D-1787D9244CC8} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
 		{B5F25A78-B7FB-460B-9B71-BE82D22923FD} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
 		{E06CE29E-15EB-4C0E-97B7-4367FFEDD98D} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
 		{9021FD06-E11E-42DE-87EF-A1040BA5DB56} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
-		{2B8ED012-22B5-47DD-A879-FD2AFD4C067D} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
-		{D3B6805B-F10E-4A19-99FC-55506892BC18} = {7C1317AA-5F4C-42A4-80F3-856BA5E204AF}
-		{D7C2C4C7-CF28-4E2B-8749-31D7E6072588} = {7C1317AA-5F4C-42A4-80F3-856BA5E204AF}
-		{90548F7B-C673-42C9-BD88-A6E6550ECE1C} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
+		{87219539-82DC-4605-BFFA-69547203AEB3} = {EEA4A938-C9F5-45E5-BF34-AA10FFC34377}
+		{401090CE-81C8-4C6C-8F12-DF962AE8CB1C} = {EEA4A938-C9F5-45E5-BF34-AA10FFC34377}
+		{EEA4A938-C9F5-45E5-BF34-AA10FFC34377} = {93E96311-7199-450E-B6DD-C295A09EA7AF}
+		{B21B1C26-B5FD-4A30-B8C9-69DE311B6F03} = {7B675C35-5AB4-45A8-A5DF-32A2B586C070}
+		{6D9421F9-E06A-4984-AD31-C587A6200CF7} = {7B675C35-5AB4-45A8-A5DF-32A2B586C070}
+		{7B675C35-5AB4-45A8-A5DF-32A2B586C070} = {93E96311-7199-450E-B6DD-C295A09EA7AF}
+		{759C53AF-4A71-475D-96C1-418D99CF636F} = {C0B95665-ADCD-477C-83C5-8CF7FB2C9093}
+		{C0B95665-ADCD-477C-83C5-8CF7FB2C9093} = {93E96311-7199-450E-B6DD-C295A09EA7AF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FE89CDC6-6313-439C-85D7-A81D5DF593E9}
diff --git a/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln b/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln
index 2dcf9cd2b36ab..a1e7da32e323c 100644
--- a/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln
+++ b/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln
@@ -7,12 +7,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{9E533FC4-A2C1-4021-8102-DE440A731236}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{87AA8A4F-2785-4E1D-BAB2-3C6414C8D387}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{959348BC-2D38-41F4-9F3D-2E1CD18D9477}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{AB1FA57B-0C7A-4181-B28C-2D8B63AF602B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{92CF1194-29BD-444D-952E-77EEA741D8DD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{53929125-1EA0-4510-B345-BA0A3BAFF33E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{C363A5DE-43B7-405E-AD76-5A9D4591DEC0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{99B9F0A6-46B8-4B04-B887-7ACE1EF0DD61}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9BF048D0-411D-4C2A-8C32-3A3255501D27}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A447D0CB-601
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{069D6714-DE43-45C4-BABC-C8246B974CA7}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{759FB424-166D-4160-90E2-F862915F67C8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{4BBBFF2A-3743-47F7-AA29-7AD31E06CE89}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{E1F5E7C2-888F-459D-B07C-88E20ABA4BDA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{A49D97EC-EF0D-4622-8589-6FBC7188E7EE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{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
-		{9E533FC4-A2C1-4021-8102-DE440A731236}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E533FC4-A2C1-4021-8102-DE440A731236}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E533FC4-A2C1-4021-8102-DE440A731236}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E533FC4-A2C1-4021-8102-DE440A731236}.Release|Any CPU.Build.0 = Release|Any CPU
 		{87AA8A4F-2785-4E1D-BAB2-3C6414C8D387}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{87AA8A4F-2785-4E1D-BAB2-3C6414C8D387}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{87AA8A4F-2785-4E1D-BAB2-3C6414C8D387}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{959348BC-2D38-41F4-9F3D-2E1CD18D9477}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{959348BC-2D38-41F4-9F3D-2E1CD18D9477}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{959348BC-2D38-41F4-9F3D-2E1CD18D9477}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB1FA57B-0C7A-4181-B28C-2D8B63AF602B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB1FA57B-0C7A-4181-B28C-2D8B63AF602B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB1FA57B-0C7A-4181-B28C-2D8B63AF602B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB1FA57B-0C7A-4181-B28C-2D8B63AF602B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92CF1194-29BD-444D-952E-77EEA741D8DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92CF1194-29BD-444D-952E-77EEA741D8DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92CF1194-29BD-444D-952E-77EEA741D8DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92CF1194-29BD-444D-952E-77EEA741D8DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53929125-1EA0-4510-B345-BA0A3BAFF33E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53929125-1EA0-4510-B345-BA0A3BAFF33E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53929125-1EA0-4510-B345-BA0A3BAFF33E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53929125-1EA0-4510-B345-BA0A3BAFF33E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C363A5DE-43B7-405E-AD76-5A9D4591DEC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C363A5DE-43B7-405E-AD76-5A9D4591DEC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C363A5DE-43B7-405E-AD76-5A9D4591DEC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C363A5DE-43B7-405E-AD76-5A9D4591DEC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99B9F0A6-46B8-4B04-B887-7ACE1EF0DD61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99B9F0A6-46B8-4B04-B887-7ACE1EF0DD61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99B9F0A6-46B8-4B04-B887-7ACE1EF0DD61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99B9F0A6-46B8-4B04-B887-7ACE1EF0DD61}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,9 +96,16 @@ Global
 		{43DBAD84-A865-4F5F-AB76-7F3EB6784E99} = {76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3}
 		{EF75497C-6CB7-4471-980A-619EA1AB8CF6} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
 		{09E28D94-B771-48EB-800C-5A80C2C0055C} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
-		{9E533FC4-A2C1-4021-8102-DE440A731236} = {069D6714-DE43-45C4-BABC-C8246B974CA7}
 		{87AA8A4F-2785-4E1D-BAB2-3C6414C8D387} = {069D6714-DE43-45C4-BABC-C8246B974CA7}
 		{959348BC-2D38-41F4-9F3D-2E1CD18D9477} = {069D6714-DE43-45C4-BABC-C8246B974CA7}
+		{AB1FA57B-0C7A-4181-B28C-2D8B63AF602B} = {759FB424-166D-4160-90E2-F862915F67C8}
+		{92CF1194-29BD-444D-952E-77EEA741D8DD} = {759FB424-166D-4160-90E2-F862915F67C8}
+		{759FB424-166D-4160-90E2-F862915F67C8} = {A49D97EC-EF0D-4622-8589-6FBC7188E7EE}
+		{53929125-1EA0-4510-B345-BA0A3BAFF33E} = {4BBBFF2A-3743-47F7-AA29-7AD31E06CE89}
+		{C363A5DE-43B7-405E-AD76-5A9D4591DEC0} = {4BBBFF2A-3743-47F7-AA29-7AD31E06CE89}
+		{4BBBFF2A-3743-47F7-AA29-7AD31E06CE89} = {A49D97EC-EF0D-4622-8589-6FBC7188E7EE}
+		{99B9F0A6-46B8-4B04-B887-7ACE1EF0DD61} = {E1F5E7C2-888F-459D-B07C-88E20ABA4BDA}
+		{E1F5E7C2-888F-459D-B07C-88E20ABA4BDA} = {A49D97EC-EF0D-4622-8589-6FBC7188E7EE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7D279EE5-E38F-4125-AE82-6ADE52D72F26}
diff --git a/src/libraries/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.sln b/src/libraries/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.sln
index 90b82606258c8..ed8fadf41ebf9 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.sln
+++ b/src/libraries/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.sln
@@ -5,18 +5,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NETCore.Platforms
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NETCore.Platforms.Tests", "tests\Microsoft.NETCore.Platforms.Tests.csproj", "{0C60F372-5C73-4BFA-9B91-5659C88F9750}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{89E78703-8B4C-4911-A4E6-794E7DC4D581}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{45449066-3A31-43E5-B705-20D667080A23}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{2E3568B1-EC27-4F02-BC0E-71DD3FD7735B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{BF52D0B1-1AD8-49DB-B910-9F9D7D41292A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{BEFED0BD-AD56-4FAC-B9A7-CCE8BB5F8768}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{41387647-9500-448C-B021-B4837947EF62}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{281E9ED5-5F16-475D-B50B-501633FCC8C6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{20346A2D-06DD-4E3E-96D4-C9BF32697AE3}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E4827496-6F39-4CA0-8F4A-ACDE9DFEBE5C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F96FBD24-3BB3-4D02-9884-4D90F94DD3C0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E8010E1D-FDAF-481D-AA34-3B115B667E4B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{2B7F6369-F9CA-493A-A105-B7B7B697A31F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{A527D4DF-4D57-40AE-B63B-1945F1D4FF3F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{EB2B9277-DB89-4554-8499-C3240163E875}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0F4ABB64-2357-49FB-9BD3-8FEFC2A650E6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,10 +51,6 @@ Global
 		{0C60F372-5C73-4BFA-9B91-5659C88F9750}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0C60F372-5C73-4BFA-9B91-5659C88F9750}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C60F372-5C73-4BFA-9B91-5659C88F9750}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89E78703-8B4C-4911-A4E6-794E7DC4D581}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89E78703-8B4C-4911-A4E6-794E7DC4D581}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89E78703-8B4C-4911-A4E6-794E7DC4D581}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89E78703-8B4C-4911-A4E6-794E7DC4D581}.Release|Any CPU.Build.0 = Release|Any CPU
 		{45449066-3A31-43E5-B705-20D667080A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{45449066-3A31-43E5-B705-20D667080A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{45449066-3A31-43E5-B705-20D667080A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -47,6 +59,26 @@ Global
 		{2E3568B1-EC27-4F02-BC0E-71DD3FD7735B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2E3568B1-EC27-4F02-BC0E-71DD3FD7735B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E3568B1-EC27-4F02-BC0E-71DD3FD7735B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF52D0B1-1AD8-49DB-B910-9F9D7D41292A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF52D0B1-1AD8-49DB-B910-9F9D7D41292A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF52D0B1-1AD8-49DB-B910-9F9D7D41292A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF52D0B1-1AD8-49DB-B910-9F9D7D41292A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEFED0BD-AD56-4FAC-B9A7-CCE8BB5F8768}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEFED0BD-AD56-4FAC-B9A7-CCE8BB5F8768}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEFED0BD-AD56-4FAC-B9A7-CCE8BB5F8768}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEFED0BD-AD56-4FAC-B9A7-CCE8BB5F8768}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41387647-9500-448C-B021-B4837947EF62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41387647-9500-448C-B021-B4837947EF62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41387647-9500-448C-B021-B4837947EF62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41387647-9500-448C-B021-B4837947EF62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{281E9ED5-5F16-475D-B50B-501633FCC8C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{281E9ED5-5F16-475D-B50B-501633FCC8C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{281E9ED5-5F16-475D-B50B-501633FCC8C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{281E9ED5-5F16-475D-B50B-501633FCC8C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20346A2D-06DD-4E3E-96D4-C9BF32697AE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20346A2D-06DD-4E3E-96D4-C9BF32697AE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20346A2D-06DD-4E3E-96D4-C9BF32697AE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20346A2D-06DD-4E3E-96D4-C9BF32697AE3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -55,9 +87,16 @@ Global
 		{39BCA125-321F-490F-AD4E-28DCB4406969} = {E4827496-6F39-4CA0-8F4A-ACDE9DFEBE5C}
 		{0C60F372-5C73-4BFA-9B91-5659C88F9750} = {E4827496-6F39-4CA0-8F4A-ACDE9DFEBE5C}
 		{BFFF96CC-06AA-4291-9F93-3E77F23DBB11} = {F96FBD24-3BB3-4D02-9884-4D90F94DD3C0}
-		{89E78703-8B4C-4911-A4E6-794E7DC4D581} = {E8010E1D-FDAF-481D-AA34-3B115B667E4B}
 		{45449066-3A31-43E5-B705-20D667080A23} = {E8010E1D-FDAF-481D-AA34-3B115B667E4B}
 		{2E3568B1-EC27-4F02-BC0E-71DD3FD7735B} = {E8010E1D-FDAF-481D-AA34-3B115B667E4B}
+		{BF52D0B1-1AD8-49DB-B910-9F9D7D41292A} = {2B7F6369-F9CA-493A-A105-B7B7B697A31F}
+		{BEFED0BD-AD56-4FAC-B9A7-CCE8BB5F8768} = {2B7F6369-F9CA-493A-A105-B7B7B697A31F}
+		{2B7F6369-F9CA-493A-A105-B7B7B697A31F} = {0F4ABB64-2357-49FB-9BD3-8FEFC2A650E6}
+		{41387647-9500-448C-B021-B4837947EF62} = {A527D4DF-4D57-40AE-B63B-1945F1D4FF3F}
+		{281E9ED5-5F16-475D-B50B-501633FCC8C6} = {A527D4DF-4D57-40AE-B63B-1945F1D4FF3F}
+		{A527D4DF-4D57-40AE-B63B-1945F1D4FF3F} = {0F4ABB64-2357-49FB-9BD3-8FEFC2A650E6}
+		{20346A2D-06DD-4E3E-96D4-C9BF32697AE3} = {EB2B9277-DB89-4554-8499-C3240163E875}
+		{EB2B9277-DB89-4554-8499-C3240163E875} = {0F4ABB64-2357-49FB-9BD3-8FEFC2A650E6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E946A528-C3E7-48EC-AD6D-AE84ED2B11AC}
diff --git a/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln b/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
index 646a3d7afbb94..669f9bd038d09 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
+++ b/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
@@ -21,6 +21,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePa
 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}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{0618F03A-8DB1-41C5-AAEF-A1A54E024260}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{6D226B68-D1FC-4AA2-A655-0AF68796F18C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{34110C14-0B75-4320-8F65-77AA39587B24}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{5302E8D8-8ADC-4FA6-B116-B1F9FF71ACDD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{7C7DC9E8-F333-412B-9434-278B337C6572}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3FD0B41F-6CEA-4AE2-832F-60C8686858C4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3BC7B60B-4BE3-4D6F-8C03-8D6BDACC845E}"
@@ -29,6 +39,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2FC8E7CF-2E2
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{037CA0A6-EB43-4A49-A854-E13AE7B8972D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CAF72038-74B0-44E3-A557-E7828DF9A914}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{C7EA0D7C-682F-4E26-A466-2507A5FF3212}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{559CE364-1B51-4EBA-A0A5-B1F271F0C122}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{4AAEF229-C45A-4DEE-BDC2-430577791C4C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,6 +97,26 @@ Global
 		{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
+		{0618F03A-8DB1-41C5-AAEF-A1A54E024260}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0618F03A-8DB1-41C5-AAEF-A1A54E024260}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0618F03A-8DB1-41C5-AAEF-A1A54E024260}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0618F03A-8DB1-41C5-AAEF-A1A54E024260}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D226B68-D1FC-4AA2-A655-0AF68796F18C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D226B68-D1FC-4AA2-A655-0AF68796F18C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D226B68-D1FC-4AA2-A655-0AF68796F18C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D226B68-D1FC-4AA2-A655-0AF68796F18C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34110C14-0B75-4320-8F65-77AA39587B24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34110C14-0B75-4320-8F65-77AA39587B24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34110C14-0B75-4320-8F65-77AA39587B24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34110C14-0B75-4320-8F65-77AA39587B24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5302E8D8-8ADC-4FA6-B116-B1F9FF71ACDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5302E8D8-8ADC-4FA6-B116-B1F9FF71ACDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5302E8D8-8ADC-4FA6-B116-B1F9FF71ACDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5302E8D8-8ADC-4FA6-B116-B1F9FF71ACDD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C7DC9E8-F333-412B-9434-278B337C6572}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C7DC9E8-F333-412B-9434-278B337C6572}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C7DC9E8-F333-412B-9434-278B337C6572}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C7DC9E8-F333-412B-9434-278B337C6572}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -95,6 +133,14 @@ Global
 		{58FF6A8C-3BAB-4C28-9940-1FAAD0896D2E} = {037CA0A6-EB43-4A49-A854-E13AE7B8972D}
 		{18CE2A0D-C20E-42E5-9845-A934A5073529} = {037CA0A6-EB43-4A49-A854-E13AE7B8972D}
 		{DD515FA9-D026-4B9B-9456-2D174634C12D} = {037CA0A6-EB43-4A49-A854-E13AE7B8972D}
+		{0618F03A-8DB1-41C5-AAEF-A1A54E024260} = {CAF72038-74B0-44E3-A557-E7828DF9A914}
+		{6D226B68-D1FC-4AA2-A655-0AF68796F18C} = {CAF72038-74B0-44E3-A557-E7828DF9A914}
+		{CAF72038-74B0-44E3-A557-E7828DF9A914} = {4AAEF229-C45A-4DEE-BDC2-430577791C4C}
+		{34110C14-0B75-4320-8F65-77AA39587B24} = {C7EA0D7C-682F-4E26-A466-2507A5FF3212}
+		{5302E8D8-8ADC-4FA6-B116-B1F9FF71ACDD} = {C7EA0D7C-682F-4E26-A466-2507A5FF3212}
+		{C7EA0D7C-682F-4E26-A466-2507A5FF3212} = {4AAEF229-C45A-4DEE-BDC2-430577791C4C}
+		{7C7DC9E8-F333-412B-9434-278B337C6572} = {559CE364-1B51-4EBA-A0A5-B1F271F0C122}
+		{559CE364-1B51-4EBA-A0A5-B1F271F0C122} = {4AAEF229-C45A-4DEE-BDC2-430577791C4C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4C265A0A-56EF-41A8-B973-AA764175AA29}
diff --git a/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln b/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
index 22bc0c14e66b0..ef2dca7943a2e 100644
--- a/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
+++ b/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
@@ -19,14 +19,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{EC1A6210-05C0-4F57-969C-0EE0F29B5B67}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{44B79C97-BA70-4955-8478-87D5CB5CD3B5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{185C0888-3794-4A7E-89B5-A24AB3DE8D74}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{C21B76F3-8455-4F3C-88D3-E733D388F317}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{FE54742C-ABB4-4863-8EAE-B72933AAD4F9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CEC48784-C8F0-46DF-AA1E-07850E754180}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{08BAF9E0-068B-4201-91E6-91B725ABE3D2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{44B79C97-BA70-4955-8478-87D5CB5CD3B5}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A48D1F08-4510-44F9-9E77-7164B2769064}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{32BFF540-62FE-4B93-BE7E-A41853C63CA9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{76C564B7-A81E-4F48-8C45-9ED2CC2261FD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{383DA25B-891E-400D-B66E-DFACFDE9B884}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{AF320CAF-CA65-4BFC-96C3-B660F17D26FB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -265,21 +285,134 @@ Global
 		{EC1A6210-05C0-4F57-969C-0EE0F29B5B67}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{EC1A6210-05C0-4F57-969C-0EE0F29B5B67}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{EC1A6210-05C0-4F57-969C-0EE0F29B5B67}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Debug|x64.Build.0 = Debug|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Debug|x86.Build.0 = Debug|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Release|arm.ActiveCfg = Release|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Release|x64.ActiveCfg = Release|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Release|x64.Build.0 = Release|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Release|x86.ActiveCfg = Release|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Release|x86.Build.0 = Release|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Debug|x64.Build.0 = Debug|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Debug|x86.Build.0 = Debug|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Release|arm.ActiveCfg = Release|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Release|x64.ActiveCfg = Release|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Release|x64.Build.0 = Release|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Release|x86.ActiveCfg = Release|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Release|x86.Build.0 = Release|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Debug|x64.Build.0 = Debug|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Debug|x86.Build.0 = Debug|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Release|arm.ActiveCfg = Release|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Release|arm64.ActiveCfg = Release|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Release|x64.ActiveCfg = Release|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Release|x64.Build.0 = Release|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Release|x86.ActiveCfg = Release|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Release|x86.Build.0 = Release|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Debug|x64.Build.0 = Debug|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Debug|x86.Build.0 = Debug|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Release|arm.ActiveCfg = Release|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Release|x64.ActiveCfg = Release|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Release|x64.Build.0 = Release|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Release|x86.ActiveCfg = Release|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Release|x86.Build.0 = Release|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Debug|x64.Build.0 = Debug|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Debug|x86.Build.0 = Debug|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Release|arm.ActiveCfg = Release|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Release|x64.ActiveCfg = Release|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Release|x64.Build.0 = Release|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Release|x86.ActiveCfg = Release|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Release|x86.Build.0 = Release|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C21B76F3-8455-4F3C-88D3-E733D388F317}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{7D1AFE3C-882D-4D27-A915-B87A1BC82D2D} = {44B79C97-BA70-4955-8478-87D5CB5CD3B5}
-		{B3BBD7D9-30F3-43D3-9D6A-C9BD5E19D32E} = {44B79C97-BA70-4955-8478-87D5CB5CD3B5}
+		{7D1AFE3C-882D-4D27-A915-B87A1BC82D2D} = {FE54742C-ABB4-4863-8EAE-B72933AAD4F9}
 		{069C76AC-B41A-4E17-A066-12233592145D} = {CEC48784-C8F0-46DF-AA1E-07850E754180}
 		{B43D6BB6-1760-4DB9-87CB-792D42846C62} = {CEC48784-C8F0-46DF-AA1E-07850E754180}
 		{EA142E29-EE37-4751-868B-27516AE0A209} = {08BAF9E0-068B-4201-91E6-91B725ABE3D2}
 		{895AA9ED-9EBE-489A-B765-22D3358A3438} = {08BAF9E0-068B-4201-91E6-91B725ABE3D2}
 		{EC1A6210-05C0-4F57-969C-0EE0F29B5B67} = {08BAF9E0-068B-4201-91E6-91B725ABE3D2}
+		{B3BBD7D9-30F3-43D3-9D6A-C9BD5E19D32E} = {44B79C97-BA70-4955-8478-87D5CB5CD3B5}
 		{5F4ABB4F-CE69-47B7-860F-40B0DA68A7DB} = {A48D1F08-4510-44F9-9E77-7164B2769064}
 		{5918B01B-FCAE-4321-8DCA-44466A57C04E} = {A48D1F08-4510-44F9-9E77-7164B2769064}
 		{EE5972A3-AD58-430B-ACEB-4F608FD1C0D6} = {A48D1F08-4510-44F9-9E77-7164B2769064}
+		{559BBFDE-D6B6-4F51-A3A2-F7978E492FD6} = {32BFF540-62FE-4B93-BE7E-A41853C63CA9}
+		{2A16BC8D-BCB6-4900-9DF1-E47CE2877515} = {32BFF540-62FE-4B93-BE7E-A41853C63CA9}
+		{32BFF540-62FE-4B93-BE7E-A41853C63CA9} = {AF320CAF-CA65-4BFC-96C3-B660F17D26FB}
+		{185C0888-3794-4A7E-89B5-A24AB3DE8D74} = {76C564B7-A81E-4F48-8C45-9ED2CC2261FD}
+		{1B8BB7B0-376A-4180-A360-7C3EFF6F738C} = {76C564B7-A81E-4F48-8C45-9ED2CC2261FD}
+		{76C564B7-A81E-4F48-8C45-9ED2CC2261FD} = {AF320CAF-CA65-4BFC-96C3-B660F17D26FB}
+		{C21B76F3-8455-4F3C-88D3-E733D388F317} = {383DA25B-891E-400D-B66E-DFACFDE9B884}
+		{383DA25B-891E-400D-B66E-DFACFDE9B884} = {AF320CAF-CA65-4BFC-96C3-B660F17D26FB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B6D42557-6A7E-4DEB-83B6-1A5BD020735D}
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 250d70266a92d..957f4bb900d16 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
@@ -7,12 +7,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry.Ac
 EndProject
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{96A7093F-A1D1-408B-90E9-6B10EA6FF6EE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{CD8304A8-4F14-45B7-B035-6D45D5ED3ECE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9BCDE466-92C1-45ED-A9F1-6973D93DF5DF}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{7AC324E3-BF40-4F3E-BA55-020DD43F69E6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{27443A96-187A-4AD4-9239-DE4E84915559}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{B0872508-7CC4-4224-8BF4-4D0B6EFC26D7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{D6A29002-3862-4365-8431-68733EAC5FC8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{5F1FD9B4-7C2D-4EA6-9AA8-52EA7E0D54D5}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BF17487D-E9E3-4054-85A7-E64243B91780}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{84D58703-7569-445A-89B8-14D024FB6091}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{29A3E154-E50
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BEA56439-DD4D-4DF6-9F07-33670D77D7FD}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{902A660A-58FF-4672-8E24-AA4728DAD6D4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{FBD18BCE-478E-43AB-82FC-1AE39305649A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{497C16C5-9EDB-4DBC-8311-A0AEA5B5AB58}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{089B5E41-0564-4F98-B19D-279EE3CB8A5E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{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
-		{96A7093F-A1D1-408B-90E9-6B10EA6FF6EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96A7093F-A1D1-408B-90E9-6B10EA6FF6EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96A7093F-A1D1-408B-90E9-6B10EA6FF6EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{96A7093F-A1D1-408B-90E9-6B10EA6FF6EE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CD8304A8-4F14-45B7-B035-6D45D5ED3ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CD8304A8-4F14-45B7-B035-6D45D5ED3ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CD8304A8-4F14-45B7-B035-6D45D5ED3ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{9BCDE466-92C1-45ED-A9F1-6973D93DF5DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9BCDE466-92C1-45ED-A9F1-6973D93DF5DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9BCDE466-92C1-45ED-A9F1-6973D93DF5DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AC324E3-BF40-4F3E-BA55-020DD43F69E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AC324E3-BF40-4F3E-BA55-020DD43F69E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AC324E3-BF40-4F3E-BA55-020DD43F69E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AC324E3-BF40-4F3E-BA55-020DD43F69E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27443A96-187A-4AD4-9239-DE4E84915559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27443A96-187A-4AD4-9239-DE4E84915559}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27443A96-187A-4AD4-9239-DE4E84915559}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27443A96-187A-4AD4-9239-DE4E84915559}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0872508-7CC4-4224-8BF4-4D0B6EFC26D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0872508-7CC4-4224-8BF4-4D0B6EFC26D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0872508-7CC4-4224-8BF4-4D0B6EFC26D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0872508-7CC4-4224-8BF4-4D0B6EFC26D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6A29002-3862-4365-8431-68733EAC5FC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6A29002-3862-4365-8431-68733EAC5FC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6A29002-3862-4365-8431-68733EAC5FC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6A29002-3862-4365-8431-68733EAC5FC8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F1FD9B4-7C2D-4EA6-9AA8-52EA7E0D54D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F1FD9B4-7C2D-4EA6-9AA8-52EA7E0D54D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F1FD9B4-7C2D-4EA6-9AA8-52EA7E0D54D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F1FD9B4-7C2D-4EA6-9AA8-52EA7E0D54D5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,9 +96,16 @@ Global
 		{BC8FAA75-A595-475E-B947-FA2D1E225B48} = {BF17487D-E9E3-4054-85A7-E64243B91780}
 		{97F37414-7633-4B76-AFA4-284E26894FB4} = {84D58703-7569-445A-89B8-14D024FB6091}
 		{9A0E9CD8-33FA-4E02-8EB6-5685CD84D727} = {29A3E154-E50B-49E7-96C3-32A91CAB9BA0}
-		{96A7093F-A1D1-408B-90E9-6B10EA6FF6EE} = {BEA56439-DD4D-4DF6-9F07-33670D77D7FD}
 		{CD8304A8-4F14-45B7-B035-6D45D5ED3ECE} = {BEA56439-DD4D-4DF6-9F07-33670D77D7FD}
 		{9BCDE466-92C1-45ED-A9F1-6973D93DF5DF} = {BEA56439-DD4D-4DF6-9F07-33670D77D7FD}
+		{7AC324E3-BF40-4F3E-BA55-020DD43F69E6} = {902A660A-58FF-4672-8E24-AA4728DAD6D4}
+		{27443A96-187A-4AD4-9239-DE4E84915559} = {902A660A-58FF-4672-8E24-AA4728DAD6D4}
+		{902A660A-58FF-4672-8E24-AA4728DAD6D4} = {089B5E41-0564-4F98-B19D-279EE3CB8A5E}
+		{B0872508-7CC4-4224-8BF4-4D0B6EFC26D7} = {FBD18BCE-478E-43AB-82FC-1AE39305649A}
+		{D6A29002-3862-4365-8431-68733EAC5FC8} = {FBD18BCE-478E-43AB-82FC-1AE39305649A}
+		{FBD18BCE-478E-43AB-82FC-1AE39305649A} = {089B5E41-0564-4F98-B19D-279EE3CB8A5E}
+		{5F1FD9B4-7C2D-4EA6-9AA8-52EA7E0D54D5} = {497C16C5-9EDB-4DBC-8311-A0AEA5B5AB58}
+		{497C16C5-9EDB-4DBC-8311-A0AEA5B5AB58} = {089B5E41-0564-4F98-B19D-279EE3CB8A5E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E4C2B201-85CD-4255-91AF-B179414B9679}
diff --git a/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln b/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
index 0ca78c466c8d9..40042fdc73db3 100644
--- a/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
+++ b/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
@@ -23,6 +23,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims", ".
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{7AA650CB-13BD-4AC8-B570-E78A03DE97ED}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{511763F8-9EA6-4997-BAF4-DC888D488659}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{2A970C61-E343-40D5-AE22-0AB94A8727D1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{E99D6D91-9223-4F87-938F-8465DE8671F5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{2564096A-DA43-4531-B4D3-5C15AF9A6149}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{E437A38E-EBAA-4708-8225-7BA16F771DB4}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D3839339-AF88-4867-BF81-44915AA883A2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DE8642D5-1264-473C-9896-35F348E89DBF}"
@@ -31,6 +41,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{66BCDB38-AFF
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{DC4533A7-1325-497B-91FE-89765F77DFBF}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{762BA1D0-62D6-475D-91F2-C1CDE6654DCB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{8C8B9A65-4291-402F-B6F6-3BD7F798F22F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{164743A9-91BD-4695-89A3-2B256AE2085B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{446C3DE3-A775-48A2-B188-A4B3484055EA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -85,6 +103,26 @@ Global
 		{7AA650CB-13BD-4AC8-B570-E78A03DE97ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7AA650CB-13BD-4AC8-B570-E78A03DE97ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7AA650CB-13BD-4AC8-B570-E78A03DE97ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{511763F8-9EA6-4997-BAF4-DC888D488659}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{511763F8-9EA6-4997-BAF4-DC888D488659}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{511763F8-9EA6-4997-BAF4-DC888D488659}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{511763F8-9EA6-4997-BAF4-DC888D488659}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A970C61-E343-40D5-AE22-0AB94A8727D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A970C61-E343-40D5-AE22-0AB94A8727D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A970C61-E343-40D5-AE22-0AB94A8727D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A970C61-E343-40D5-AE22-0AB94A8727D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E99D6D91-9223-4F87-938F-8465DE8671F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E99D6D91-9223-4F87-938F-8465DE8671F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E99D6D91-9223-4F87-938F-8465DE8671F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E99D6D91-9223-4F87-938F-8465DE8671F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2564096A-DA43-4531-B4D3-5C15AF9A6149}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2564096A-DA43-4531-B4D3-5C15AF9A6149}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2564096A-DA43-4531-B4D3-5C15AF9A6149}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2564096A-DA43-4531-B4D3-5C15AF9A6149}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E437A38E-EBAA-4708-8225-7BA16F771DB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E437A38E-EBAA-4708-8225-7BA16F771DB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E437A38E-EBAA-4708-8225-7BA16F771DB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E437A38E-EBAA-4708-8225-7BA16F771DB4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -102,6 +140,14 @@ Global
 		{5E90F801-5451-4E8A-8117-E86AB2A95F01} = {DC4533A7-1325-497B-91FE-89765F77DFBF}
 		{2FD3F0C9-DB36-4156-9A78-51B476636685} = {DC4533A7-1325-497B-91FE-89765F77DFBF}
 		{E8981301-50DC-4A1E-9BB0-537F9C5F2B8F} = {DC4533A7-1325-497B-91FE-89765F77DFBF}
+		{511763F8-9EA6-4997-BAF4-DC888D488659} = {762BA1D0-62D6-475D-91F2-C1CDE6654DCB}
+		{2A970C61-E343-40D5-AE22-0AB94A8727D1} = {762BA1D0-62D6-475D-91F2-C1CDE6654DCB}
+		{762BA1D0-62D6-475D-91F2-C1CDE6654DCB} = {446C3DE3-A775-48A2-B188-A4B3484055EA}
+		{E99D6D91-9223-4F87-938F-8465DE8671F5} = {8C8B9A65-4291-402F-B6F6-3BD7F798F22F}
+		{2564096A-DA43-4531-B4D3-5C15AF9A6149} = {8C8B9A65-4291-402F-B6F6-3BD7F798F22F}
+		{8C8B9A65-4291-402F-B6F6-3BD7F798F22F} = {446C3DE3-A775-48A2-B188-A4B3484055EA}
+		{E437A38E-EBAA-4708-8225-7BA16F771DB4} = {164743A9-91BD-4695-89A3-2B256AE2085B}
+		{164743A9-91BD-4695-89A3-2B256AE2085B} = {446C3DE3-A775-48A2-B188-A4B3484055EA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B41F6F2B-9220-4A42-A69F-4BF2CA7E201A}
diff --git a/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln b/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln
index ca7cb627831f3..7cfb2daceab60 100644
--- a/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln
+++ b/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln
@@ -7,12 +7,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvent
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents.Tests", "tests\Microsoft.Win32.SystemEvents.Tests.csproj", "{86962B5A-AC38-44FA-B25B-74ABAC57E534}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{F0C0F55A-1DD1-44BE-A4B7-00E3B07846A2}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2D9943FB-EBD4-4994-BDCA-7C0087CD499B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1F21915D-D799-4AAA-9053-8BFFD5102FF1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{B1351B74-82F9-4CE6-AE68-25521A465AF4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{FF36AE65-50BE-4C1D-8216-5038443D3BA4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{EDC41408-CD3D-474D-AA9E-EE60402517D3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{90476BE6-797F-41AA-89AC-0BD7DB8885AE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{0A0B8523-102B-45CB-9922-3F4F5E43C086}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F2A4093D-6291-4A9C-87FC-6B06D2324E38}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8BF90E54-BE73-4BBF-89CB-E9BE5DD1FC9E}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A9588D3E-04F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B7447478-7C05-441D-BDDF-538008B24CBD}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{8B8F314C-81E4-4624-B88D-DEF6F2F34C03}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{A5504349-FE82-4E8C-AF7F-D1B6993CF918}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{EC14A20F-FE39-42EB-B642-2DA6409FE7B1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{403A31DA-6D6F-4B63-BE94-20DA513BBE4B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{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
-		{F0C0F55A-1DD1-44BE-A4B7-00E3B07846A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0C0F55A-1DD1-44BE-A4B7-00E3B07846A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0C0F55A-1DD1-44BE-A4B7-00E3B07846A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0C0F55A-1DD1-44BE-A4B7-00E3B07846A2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2D9943FB-EBD4-4994-BDCA-7C0087CD499B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2D9943FB-EBD4-4994-BDCA-7C0087CD499B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2D9943FB-EBD4-4994-BDCA-7C0087CD499B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{1F21915D-D799-4AAA-9053-8BFFD5102FF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F21915D-D799-4AAA-9053-8BFFD5102FF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F21915D-D799-4AAA-9053-8BFFD5102FF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1351B74-82F9-4CE6-AE68-25521A465AF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1351B74-82F9-4CE6-AE68-25521A465AF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1351B74-82F9-4CE6-AE68-25521A465AF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1351B74-82F9-4CE6-AE68-25521A465AF4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FF36AE65-50BE-4C1D-8216-5038443D3BA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF36AE65-50BE-4C1D-8216-5038443D3BA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF36AE65-50BE-4C1D-8216-5038443D3BA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF36AE65-50BE-4C1D-8216-5038443D3BA4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDC41408-CD3D-474D-AA9E-EE60402517D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDC41408-CD3D-474D-AA9E-EE60402517D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDC41408-CD3D-474D-AA9E-EE60402517D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDC41408-CD3D-474D-AA9E-EE60402517D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90476BE6-797F-41AA-89AC-0BD7DB8885AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90476BE6-797F-41AA-89AC-0BD7DB8885AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90476BE6-797F-41AA-89AC-0BD7DB8885AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90476BE6-797F-41AA-89AC-0BD7DB8885AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A0B8523-102B-45CB-9922-3F4F5E43C086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A0B8523-102B-45CB-9922-3F4F5E43C086}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A0B8523-102B-45CB-9922-3F4F5E43C086}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A0B8523-102B-45CB-9922-3F4F5E43C086}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,9 +96,16 @@ Global
 		{86962B5A-AC38-44FA-B25B-74ABAC57E534} = {F2A4093D-6291-4A9C-87FC-6B06D2324E38}
 		{A586D099-E8B0-4C2F-B4AD-BCFA98429DBF} = {8BF90E54-BE73-4BBF-89CB-E9BE5DD1FC9E}
 		{20C56707-2960-4DF2-BF76-5556304EE7CF} = {A9588D3E-04F0-4294-8D1A-84CF3D84804A}
-		{F0C0F55A-1DD1-44BE-A4B7-00E3B07846A2} = {B7447478-7C05-441D-BDDF-538008B24CBD}
 		{2D9943FB-EBD4-4994-BDCA-7C0087CD499B} = {B7447478-7C05-441D-BDDF-538008B24CBD}
 		{1F21915D-D799-4AAA-9053-8BFFD5102FF1} = {B7447478-7C05-441D-BDDF-538008B24CBD}
+		{B1351B74-82F9-4CE6-AE68-25521A465AF4} = {8B8F314C-81E4-4624-B88D-DEF6F2F34C03}
+		{FF36AE65-50BE-4C1D-8216-5038443D3BA4} = {8B8F314C-81E4-4624-B88D-DEF6F2F34C03}
+		{8B8F314C-81E4-4624-B88D-DEF6F2F34C03} = {403A31DA-6D6F-4B63-BE94-20DA513BBE4B}
+		{EDC41408-CD3D-474D-AA9E-EE60402517D3} = {A5504349-FE82-4E8C-AF7F-D1B6993CF918}
+		{90476BE6-797F-41AA-89AC-0BD7DB8885AE} = {A5504349-FE82-4E8C-AF7F-D1B6993CF918}
+		{A5504349-FE82-4E8C-AF7F-D1B6993CF918} = {403A31DA-6D6F-4B63-BE94-20DA513BBE4B}
+		{0A0B8523-102B-45CB-9922-3F4F5E43C086} = {EC14A20F-FE39-42EB-B642-2DA6409FE7B1}
+		{EC14A20F-FE39-42EB-B642-2DA6409FE7B1} = {403A31DA-6D6F-4B63-BE94-20DA513BBE4B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {14621231-E5C2-4B46-9ADC-1182F2721D07}
diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln b/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln
index 2b0e64aecc3d4..50e0e8ae8f168 100644
--- a/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln
@@ -7,18 +7,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.XmlSerializer.Gen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SerializableAssembly", "tests\SerializableAssembly.csproj", "{9D614FC7-0A88-4E85-B8A9-25FFFD71C47A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{76BEA53B-7E34-47AA-95E2-6295169AC970}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2307F11D-6FF4-45B0-9FA2-7B9807647E2B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B1A05556-02FE-4BC0-89E4-4C6CC751675B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{B420E4A6-7A45-4FFA-B3AC-1A1A49D9C08F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{0317802B-EEEA-4AFB-A8D2-B67A12EAD0C2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{3CC83A70-C509-436C-AEAD-F2378CBF4E95}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{5316C388-22B9-4F32-B50B-F0B5C3F5E72B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{96CF41F5-97AA-4695-B191-4B5F13C2B9EF}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BA160273-1658-4D63-8BB0-BEDDA0DAF20D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CC406051-3EEC-4E4F-8152-2F1BE15D61BA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A3A8F98E-3524-4E5A-87C5-5324FD52E296}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{99FE37B2-FBA7-4093-996F-702B154514C6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D21A60D5-4BB7-4AEE-A35B-1445FB125E9E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{7AB2F2C8-A835-405E-B7DA-2ADDC8981490}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{ADBFF9D5-22FC-419C-9029-72CFBE7E7E6D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +57,6 @@ Global
 		{9D614FC7-0A88-4E85-B8A9-25FFFD71C47A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9D614FC7-0A88-4E85-B8A9-25FFFD71C47A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9D614FC7-0A88-4E85-B8A9-25FFFD71C47A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76BEA53B-7E34-47AA-95E2-6295169AC970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76BEA53B-7E34-47AA-95E2-6295169AC970}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76BEA53B-7E34-47AA-95E2-6295169AC970}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76BEA53B-7E34-47AA-95E2-6295169AC970}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2307F11D-6FF4-45B0-9FA2-7B9807647E2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2307F11D-6FF4-45B0-9FA2-7B9807647E2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2307F11D-6FF4-45B0-9FA2-7B9807647E2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -53,6 +65,26 @@ Global
 		{B1A05556-02FE-4BC0-89E4-4C6CC751675B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B1A05556-02FE-4BC0-89E4-4C6CC751675B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B1A05556-02FE-4BC0-89E4-4C6CC751675B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B420E4A6-7A45-4FFA-B3AC-1A1A49D9C08F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B420E4A6-7A45-4FFA-B3AC-1A1A49D9C08F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B420E4A6-7A45-4FFA-B3AC-1A1A49D9C08F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B420E4A6-7A45-4FFA-B3AC-1A1A49D9C08F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0317802B-EEEA-4AFB-A8D2-B67A12EAD0C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0317802B-EEEA-4AFB-A8D2-B67A12EAD0C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0317802B-EEEA-4AFB-A8D2-B67A12EAD0C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0317802B-EEEA-4AFB-A8D2-B67A12EAD0C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3CC83A70-C509-436C-AEAD-F2378CBF4E95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3CC83A70-C509-436C-AEAD-F2378CBF4E95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3CC83A70-C509-436C-AEAD-F2378CBF4E95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3CC83A70-C509-436C-AEAD-F2378CBF4E95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5316C388-22B9-4F32-B50B-F0B5C3F5E72B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5316C388-22B9-4F32-B50B-F0B5C3F5E72B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5316C388-22B9-4F32-B50B-F0B5C3F5E72B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5316C388-22B9-4F32-B50B-F0B5C3F5E72B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96CF41F5-97AA-4695-B191-4B5F13C2B9EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96CF41F5-97AA-4695-B191-4B5F13C2B9EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96CF41F5-97AA-4695-B191-4B5F13C2B9EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96CF41F5-97AA-4695-B191-4B5F13C2B9EF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -62,9 +94,16 @@ Global
 		{A90B6063-66BB-486C-8267-43AC8F9C5196} = {BA160273-1658-4D63-8BB0-BEDDA0DAF20D}
 		{9D614FC7-0A88-4E85-B8A9-25FFFD71C47A} = {BA160273-1658-4D63-8BB0-BEDDA0DAF20D}
 		{3C8417AB-8E73-4EBF-B090-1367F3D23468} = {CC406051-3EEC-4E4F-8152-2F1BE15D61BA}
-		{76BEA53B-7E34-47AA-95E2-6295169AC970} = {A3A8F98E-3524-4E5A-87C5-5324FD52E296}
 		{2307F11D-6FF4-45B0-9FA2-7B9807647E2B} = {A3A8F98E-3524-4E5A-87C5-5324FD52E296}
 		{B1A05556-02FE-4BC0-89E4-4C6CC751675B} = {A3A8F98E-3524-4E5A-87C5-5324FD52E296}
+		{B420E4A6-7A45-4FFA-B3AC-1A1A49D9C08F} = {99FE37B2-FBA7-4093-996F-702B154514C6}
+		{0317802B-EEEA-4AFB-A8D2-B67A12EAD0C2} = {99FE37B2-FBA7-4093-996F-702B154514C6}
+		{99FE37B2-FBA7-4093-996F-702B154514C6} = {ADBFF9D5-22FC-419C-9029-72CFBE7E7E6D}
+		{3CC83A70-C509-436C-AEAD-F2378CBF4E95} = {D21A60D5-4BB7-4AEE-A35B-1445FB125E9E}
+		{5316C388-22B9-4F32-B50B-F0B5C3F5E72B} = {D21A60D5-4BB7-4AEE-A35B-1445FB125E9E}
+		{D21A60D5-4BB7-4AEE-A35B-1445FB125E9E} = {ADBFF9D5-22FC-419C-9029-72CFBE7E7E6D}
+		{96CF41F5-97AA-4695-B191-4B5F13C2B9EF} = {7AB2F2C8-A835-405E-B7DA-2ADDC8981490}
+		{7AB2F2C8-A835-405E-B7DA-2ADDC8981490} = {ADBFF9D5-22FC-419C-9029-72CFBE7E7E6D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E4BEDA84-BAED-4E86-B18F-8417E2FD10BB}
diff --git a/src/libraries/System.CodeDom/System.CodeDom.sln b/src/libraries/System.CodeDom/System.CodeDom.sln
index 1d7d0c2675815..cb1e942fcd836 100644
--- a/src/libraries/System.CodeDom/System.CodeDom.sln
+++ b/src/libraries/System.CodeDom/System.CodeDom.sln
@@ -7,12 +7,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom", "src\Syste
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom.Tests", "tests\System.CodeDom.Tests.csproj", "{627FFEFC-A317-4AD1-809F-B26CA7F475BD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{B2B4DB84-BDEC-411F-AD9E-D385D289ACA1}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{B9251B70-FF97-4950-ABA7-50AB281D8F8E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{BB92EB52-7A9C-49C7-AC26-53864BAD4E1A}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{D1FCA81A-628F-42E8-9998-B1AE3AADF8FD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{6911785C-F046-4726-9035-5F67887F3AA9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{21C5C313-46B5-48B6-A40E-BA5479E50627}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{8779FDDF-4A1F-4465-9EAB-8BF3FE7BE000}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{3E702105-EF2D-4FE4-ABF6-F589BDA44130}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2D7D470B-B092-45BC-900A-CDB20CA94BE7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{54321C0F-1323-4962-A01C-AC07028C3FA8}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6591788E-089
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{91ED5DF2-6A20-4B11-B671-19BB53254EE7}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D7A93C90-3F4E-4BC8-B5BD-5D8F5329B1AB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{DD0E58EC-3356-4891-A67F-31E86643130C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{DCF41AAC-9D70-4586-822A-4F0053888BF5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{F03612EB-5E57-41EC-B546-C853D7F831EF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{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
-		{B2B4DB84-BDEC-411F-AD9E-D385D289ACA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2B4DB84-BDEC-411F-AD9E-D385D289ACA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2B4DB84-BDEC-411F-AD9E-D385D289ACA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2B4DB84-BDEC-411F-AD9E-D385D289ACA1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B9251B70-FF97-4950-ABA7-50AB281D8F8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B9251B70-FF97-4950-ABA7-50AB281D8F8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B9251B70-FF97-4950-ABA7-50AB281D8F8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{BB92EB52-7A9C-49C7-AC26-53864BAD4E1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BB92EB52-7A9C-49C7-AC26-53864BAD4E1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB92EB52-7A9C-49C7-AC26-53864BAD4E1A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1FCA81A-628F-42E8-9998-B1AE3AADF8FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1FCA81A-628F-42E8-9998-B1AE3AADF8FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1FCA81A-628F-42E8-9998-B1AE3AADF8FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1FCA81A-628F-42E8-9998-B1AE3AADF8FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6911785C-F046-4726-9035-5F67887F3AA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6911785C-F046-4726-9035-5F67887F3AA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6911785C-F046-4726-9035-5F67887F3AA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6911785C-F046-4726-9035-5F67887F3AA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21C5C313-46B5-48B6-A40E-BA5479E50627}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21C5C313-46B5-48B6-A40E-BA5479E50627}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21C5C313-46B5-48B6-A40E-BA5479E50627}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21C5C313-46B5-48B6-A40E-BA5479E50627}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8779FDDF-4A1F-4465-9EAB-8BF3FE7BE000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8779FDDF-4A1F-4465-9EAB-8BF3FE7BE000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8779FDDF-4A1F-4465-9EAB-8BF3FE7BE000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8779FDDF-4A1F-4465-9EAB-8BF3FE7BE000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E702105-EF2D-4FE4-ABF6-F589BDA44130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E702105-EF2D-4FE4-ABF6-F589BDA44130}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E702105-EF2D-4FE4-ABF6-F589BDA44130}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E702105-EF2D-4FE4-ABF6-F589BDA44130}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,9 +96,16 @@ Global
 		{627FFEFC-A317-4AD1-809F-B26CA7F475BD} = {2D7D470B-B092-45BC-900A-CDB20CA94BE7}
 		{74AE27CF-E940-4EEB-9A19-0968689B627E} = {54321C0F-1323-4962-A01C-AC07028C3FA8}
 		{14D5A803-D5BF-44E5-B2B5-0B0BC297748E} = {6591788E-0894-4655-AE2F-602407C4F766}
-		{B2B4DB84-BDEC-411F-AD9E-D385D289ACA1} = {91ED5DF2-6A20-4B11-B671-19BB53254EE7}
 		{B9251B70-FF97-4950-ABA7-50AB281D8F8E} = {91ED5DF2-6A20-4B11-B671-19BB53254EE7}
 		{BB92EB52-7A9C-49C7-AC26-53864BAD4E1A} = {91ED5DF2-6A20-4B11-B671-19BB53254EE7}
+		{D1FCA81A-628F-42E8-9998-B1AE3AADF8FD} = {D7A93C90-3F4E-4BC8-B5BD-5D8F5329B1AB}
+		{6911785C-F046-4726-9035-5F67887F3AA9} = {D7A93C90-3F4E-4BC8-B5BD-5D8F5329B1AB}
+		{D7A93C90-3F4E-4BC8-B5BD-5D8F5329B1AB} = {F03612EB-5E57-41EC-B546-C853D7F831EF}
+		{21C5C313-46B5-48B6-A40E-BA5479E50627} = {DD0E58EC-3356-4891-A67F-31E86643130C}
+		{8779FDDF-4A1F-4465-9EAB-8BF3FE7BE000} = {DD0E58EC-3356-4891-A67F-31E86643130C}
+		{DD0E58EC-3356-4891-A67F-31E86643130C} = {F03612EB-5E57-41EC-B546-C853D7F831EF}
+		{3E702105-EF2D-4FE4-ABF6-F589BDA44130} = {DCF41AAC-9D70-4586-822A-4F0053888BF5}
+		{DCF41AAC-9D70-4586-822A-4F0053888BF5} = {F03612EB-5E57-41EC-B546-C853D7F831EF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {70EC5780-3C80-4D52-93B0-7FBF64E29572}
diff --git a/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln b/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln
index 37fabd786c0a4..a9bd722e27fce 100644
--- a/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln
+++ b/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln
@@ -31,14 +31,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\Syst
 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", "{C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{2266BB4C-0245-437D-8346-CFF899111225}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{7BBDF9FE-BE36-417F-89EC-967263297931}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{18539371-17FB-4617-9DB7-5E998F65E52E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{61275B26-9E67-4E89-BC0F-5166096CFA4B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{4AAACB52-764E-41A5-BAE3-BCAD7F69CFBB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{64657647-6C2C-4D36-A5D4-7E7534F3C66F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CA1F4ADE-3F2A-40E3-9242-549F88F0367F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{93EF6213-7FD5-4A26-A8AB-AF8E4DB470FD}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{66E1333A-027B-4577-AED6-A2457698A6D9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{FEB1EA07-0931-4DFB-831F-DDE392FD6596}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{08A6CC96-3D48-47AB-8FD8-D1478438FCC4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{AEEE96F9-DAE8-4E18-95BA-070788484090}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -403,16 +423,117 @@ Global
 		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Checked|arm64.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
+		{2266BB4C-0245-437D-8346-CFF899111225}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Debug|x64.Build.0 = Debug|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Debug|x86.Build.0 = Debug|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Release|arm.ActiveCfg = Release|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Release|x64.ActiveCfg = Release|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Release|x64.Build.0 = Release|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Release|x86.ActiveCfg = Release|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Release|x86.Build.0 = Release|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2266BB4C-0245-437D-8346-CFF899111225}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Debug|x64.Build.0 = Debug|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Debug|x86.Build.0 = Debug|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Release|arm.ActiveCfg = Release|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Release|x64.ActiveCfg = Release|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Release|x64.Build.0 = Release|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Release|x86.ActiveCfg = Release|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Release|x86.Build.0 = Release|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7BBDF9FE-BE36-417F-89EC-967263297931}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Debug|x64.Build.0 = Debug|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Debug|x86.Build.0 = Debug|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Release|arm.ActiveCfg = Release|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Release|x64.ActiveCfg = Release|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Release|x64.Build.0 = Release|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Release|x86.ActiveCfg = Release|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Release|x86.Build.0 = Release|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{18539371-17FB-4617-9DB7-5E998F65E52E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Debug|x64.Build.0 = Debug|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Debug|x86.Build.0 = Debug|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Release|arm.ActiveCfg = Release|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Release|x64.ActiveCfg = Release|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Release|x64.Build.0 = Release|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Release|x86.ActiveCfg = Release|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Release|x86.Build.0 = Release|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Debug|x64.Build.0 = Debug|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Debug|x86.Build.0 = Debug|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Release|arm.ActiveCfg = Release|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Release|x64.ActiveCfg = Release|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Release|x64.Build.0 = Release|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Release|x86.ActiveCfg = Release|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Release|x86.Build.0 = Release|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0}
-		{BFA1A52C-48B4-45C7-8595-B98236A11ED1} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0}
-		{34C59132-692C-45D7-87BD-869A18F09E2C} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0}
-		{93FB3527-B9E6-4ECA-8F36-56835F4F9236} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0}
-		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0}
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322} = {4AAACB52-764E-41A5-BAE3-BCAD7F69CFBB}
 		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46} = {64657647-6C2C-4D36-A5D4-7E7534F3C66F}
 		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8} = {64657647-6C2C-4D36-A5D4-7E7534F3C66F}
 		{ADA6D062-1E28-47D8-A058-FE1F4551AA20} = {CA1F4ADE-3F2A-40E3-9242-549F88F0367F}
@@ -421,9 +542,21 @@ Global
 		{6C5BE0DF-C0E1-4971-9E4A-01105A4A013A} = {CA1F4ADE-3F2A-40E3-9242-549F88F0367F}
 		{BE035215-7EB5-4B56-9DD2-67519A631A89} = {CA1F4ADE-3F2A-40E3-9242-549F88F0367F}
 		{36F808C9-93D1-41D2-A2F8-E0F113B3F10F} = {CA1F4ADE-3F2A-40E3-9242-549F88F0367F}
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0}
+		{34C59132-692C-45D7-87BD-869A18F09E2C} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0}
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0}
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0}
 		{431D18E4-4464-45C0-BBF2-1834B73E8095} = {93EF6213-7FD5-4A26-A8AB-AF8E4DB470FD}
 		{1E072489-1073-4526-8C5D-64AC2A97BF9B} = {93EF6213-7FD5-4A26-A8AB-AF8E4DB470FD}
 		{2DB3F8FB-BDD7-471E-BF8F-D3C4D6A2BDC3} = {93EF6213-7FD5-4A26-A8AB-AF8E4DB470FD}
+		{2266BB4C-0245-437D-8346-CFF899111225} = {66E1333A-027B-4577-AED6-A2457698A6D9}
+		{7BBDF9FE-BE36-417F-89EC-967263297931} = {66E1333A-027B-4577-AED6-A2457698A6D9}
+		{66E1333A-027B-4577-AED6-A2457698A6D9} = {AEEE96F9-DAE8-4E18-95BA-070788484090}
+		{18539371-17FB-4617-9DB7-5E998F65E52E} = {FEB1EA07-0931-4DFB-831F-DDE392FD6596}
+		{61275B26-9E67-4E89-BC0F-5166096CFA4B} = {FEB1EA07-0931-4DFB-831F-DDE392FD6596}
+		{FEB1EA07-0931-4DFB-831F-DDE392FD6596} = {AEEE96F9-DAE8-4E18-95BA-070788484090}
+		{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE} = {08A6CC96-3D48-47AB-8FD8-D1478438FCC4}
+		{08A6CC96-3D48-47AB-8FD8-D1478438FCC4} = {AEEE96F9-DAE8-4E18-95BA-070788484090}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1A4F1A4C-4F4F-4E0C-9342-4B32674E2F00}
diff --git a/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln b/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln
index 900d0eb1480da..fb0d9d415a74e 100644
--- a/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln
+++ b/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln
@@ -17,6 +17,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{53DB26DA-695E-4FF9-BCE9-1CE465681F64}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{32394700-F98D-435B-A1CD-0B010059784A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{D1CD4978-9246-4376-89BE-65BBCAAE7209}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{CA8F6E44-ABF2-463A-A60B-72A7339875A7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{38068649-E572-464D-8544-2F54208EB980}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{2C6C72CF-1F02-4552-A2D5-4186D3AE683E}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D5595EA2-934D-481D-9AB9-412276C05181}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{12BB8B2C-950F-4AA8-BFED-D87D2873FEDA}"
@@ -25,6 +35,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{50502C33-83F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{EEC12D52-2DAA-4D12-A123-BB4AC370814B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{A2DA4053-61CD-4591-A7D2-EE3074258D23}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{FEC852A8-CB69-4385-B163-27B826644AFD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{3DCDA367-0F8C-4E67-AA14-FB306BC88ACD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{ACBAC0BD-F9CA-4C98-BF18-45EAC3074C8A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,6 +85,26 @@ Global
 		{53DB26DA-695E-4FF9-BCE9-1CE465681F64}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{53DB26DA-695E-4FF9-BCE9-1CE465681F64}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{53DB26DA-695E-4FF9-BCE9-1CE465681F64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32394700-F98D-435B-A1CD-0B010059784A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32394700-F98D-435B-A1CD-0B010059784A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32394700-F98D-435B-A1CD-0B010059784A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32394700-F98D-435B-A1CD-0B010059784A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1CD4978-9246-4376-89BE-65BBCAAE7209}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1CD4978-9246-4376-89BE-65BBCAAE7209}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1CD4978-9246-4376-89BE-65BBCAAE7209}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1CD4978-9246-4376-89BE-65BBCAAE7209}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA8F6E44-ABF2-463A-A60B-72A7339875A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA8F6E44-ABF2-463A-A60B-72A7339875A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA8F6E44-ABF2-463A-A60B-72A7339875A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA8F6E44-ABF2-463A-A60B-72A7339875A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{38068649-E572-464D-8544-2F54208EB980}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38068649-E572-464D-8544-2F54208EB980}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38068649-E572-464D-8544-2F54208EB980}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{38068649-E572-464D-8544-2F54208EB980}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C6C72CF-1F02-4552-A2D5-4186D3AE683E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C6C72CF-1F02-4552-A2D5-4186D3AE683E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C6C72CF-1F02-4552-A2D5-4186D3AE683E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C6C72CF-1F02-4552-A2D5-4186D3AE683E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -81,6 +119,14 @@ Global
 		{9E9FE095-8503-43E9-9291-F61597ABF8F0} = {EEC12D52-2DAA-4D12-A123-BB4AC370814B}
 		{E52EB126-11CE-4437-AA53-2001EEEEF9BC} = {EEC12D52-2DAA-4D12-A123-BB4AC370814B}
 		{FCC1AE83-36B9-464B-8A5B-8C9E8244905B} = {EEC12D52-2DAA-4D12-A123-BB4AC370814B}
+		{32394700-F98D-435B-A1CD-0B010059784A} = {A2DA4053-61CD-4591-A7D2-EE3074258D23}
+		{D1CD4978-9246-4376-89BE-65BBCAAE7209} = {A2DA4053-61CD-4591-A7D2-EE3074258D23}
+		{A2DA4053-61CD-4591-A7D2-EE3074258D23} = {ACBAC0BD-F9CA-4C98-BF18-45EAC3074C8A}
+		{CA8F6E44-ABF2-463A-A60B-72A7339875A7} = {FEC852A8-CB69-4385-B163-27B826644AFD}
+		{38068649-E572-464D-8544-2F54208EB980} = {FEC852A8-CB69-4385-B163-27B826644AFD}
+		{FEC852A8-CB69-4385-B163-27B826644AFD} = {ACBAC0BD-F9CA-4C98-BF18-45EAC3074C8A}
+		{2C6C72CF-1F02-4552-A2D5-4186D3AE683E} = {3DCDA367-0F8C-4E67-AA14-FB306BC88ACD}
+		{3DCDA367-0F8C-4E67-AA14-FB306BC88ACD} = {ACBAC0BD-F9CA-4C98-BF18-45EAC3074C8A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {62498458-77B4-4070-87BB-09F22AC54239}
diff --git a/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln b/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
index 41fd490327660..bc948836055d2 100644
--- a/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
+++ b/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
@@ -13,6 +13,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{DEAD48C1-587C-459A-B62F-1EF6E03739C3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{57B529EF-80FE-4697-B949-4C474241DEC4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{B17AD940-28E8-41FD-AF9B-21F550441871}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{7F5E80CD-51D4-4BFB-B555-F95E4A36FACA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{AE7EEF2C-889D-4FB3-AC07-7423BC705618}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{2690345D-240E-4BB0-BBFB-48CAD7B31973}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{40328A50-1C3B-412A-8176-C558898752EE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3F8044D4-DD3D-46CA-8EAE-CD03358DA425}"
@@ -21,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{97782A88-6BF
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{121A7C7D-3D67-4606-AE3E-4C9E55510A86}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{1DD8D515-13DD-4318-B9E9-FA5816B8C532}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{B8B0CA7D-0B4E-42AC-A32A-60CB519B3793}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{D1808A65-E8D0-4696-8D68-53F8CDB64694}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{474712A5-07A8-43B6-8544-5BA6732AD344}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +73,26 @@ Global
 		{DEAD48C1-587C-459A-B62F-1EF6E03739C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DEAD48C1-587C-459A-B62F-1EF6E03739C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DEAD48C1-587C-459A-B62F-1EF6E03739C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57B529EF-80FE-4697-B949-4C474241DEC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57B529EF-80FE-4697-B949-4C474241DEC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57B529EF-80FE-4697-B949-4C474241DEC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57B529EF-80FE-4697-B949-4C474241DEC4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B17AD940-28E8-41FD-AF9B-21F550441871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B17AD940-28E8-41FD-AF9B-21F550441871}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B17AD940-28E8-41FD-AF9B-21F550441871}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B17AD940-28E8-41FD-AF9B-21F550441871}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F5E80CD-51D4-4BFB-B555-F95E4A36FACA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F5E80CD-51D4-4BFB-B555-F95E4A36FACA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F5E80CD-51D4-4BFB-B555-F95E4A36FACA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F5E80CD-51D4-4BFB-B555-F95E4A36FACA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE7EEF2C-889D-4FB3-AC07-7423BC705618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE7EEF2C-889D-4FB3-AC07-7423BC705618}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE7EEF2C-889D-4FB3-AC07-7423BC705618}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE7EEF2C-889D-4FB3-AC07-7423BC705618}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2690345D-240E-4BB0-BBFB-48CAD7B31973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2690345D-240E-4BB0-BBFB-48CAD7B31973}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2690345D-240E-4BB0-BBFB-48CAD7B31973}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2690345D-240E-4BB0-BBFB-48CAD7B31973}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -67,6 +105,14 @@ Global
 		{8B963C6C-CF59-433B-B8FB-6C1EB4650DF2} = {97782A88-6BFA-46E2-9027-E72BF7E3062E}
 		{FC7A2623-48CD-4805-8C91-046D5E3D260F} = {121A7C7D-3D67-4606-AE3E-4C9E55510A86}
 		{EC51C488-C247-436A-B610-C55A01DA3037} = {121A7C7D-3D67-4606-AE3E-4C9E55510A86}
+		{57B529EF-80FE-4697-B949-4C474241DEC4} = {1DD8D515-13DD-4318-B9E9-FA5816B8C532}
+		{B17AD940-28E8-41FD-AF9B-21F550441871} = {1DD8D515-13DD-4318-B9E9-FA5816B8C532}
+		{1DD8D515-13DD-4318-B9E9-FA5816B8C532} = {474712A5-07A8-43B6-8544-5BA6732AD344}
+		{7F5E80CD-51D4-4BFB-B555-F95E4A36FACA} = {B8B0CA7D-0B4E-42AC-A32A-60CB519B3793}
+		{AE7EEF2C-889D-4FB3-AC07-7423BC705618} = {B8B0CA7D-0B4E-42AC-A32A-60CB519B3793}
+		{B8B0CA7D-0B4E-42AC-A32A-60CB519B3793} = {474712A5-07A8-43B6-8544-5BA6732AD344}
+		{2690345D-240E-4BB0-BBFB-48CAD7B31973} = {D1808A65-E8D0-4696-8D68-53F8CDB64694}
+		{D1808A65-E8D0-4696-8D68-53F8CDB64694} = {474712A5-07A8-43B6-8544-5BA6732AD344}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {42E679A9-01B2-446F-B26E-4CF16464E149}
diff --git a/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln b/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln
index 01082f6877aca..4eb47716a248e 100644
--- a/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln
+++ b/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln
@@ -23,6 +23,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{97DA293F-0743-42EA-A0B4-0E8EE4249674}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{88E9D01A-6EA9-4887-8521-22631E4BE71C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{2ADC895F-4F19-493B-8F07-67E655D81187}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{4980FCF1-1DF9-4961-A8A6-E7CFE594FD2F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{F87743F9-9B82-49B1-A437-D6149482934A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{4A979539-78A3-4FDD-9AA6-E388F1A7CC5A}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{627B9774-B9B5-4118-A051-D2022B8ECFB4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{129030A4-7D4E-401C-9F7E-722D99DC8407}"
@@ -31,6 +41,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1799B533-6E0
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{02B8FF7B-DDCB-4A38-A626-39877203DF37}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{EDEBAC03-9968-413D-9545-EE39F2FCC976}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{4216AB28-9056-4C60-9277-57E6E12DEE7B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{6EE44BA3-CBC3-4D13-85A5-1FF528F1EEF7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{5BB1BD95-3BEC-4B28-93BC-E87275C2D60D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -85,6 +103,26 @@ Global
 		{97DA293F-0743-42EA-A0B4-0E8EE4249674}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{97DA293F-0743-42EA-A0B4-0E8EE4249674}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{97DA293F-0743-42EA-A0B4-0E8EE4249674}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88E9D01A-6EA9-4887-8521-22631E4BE71C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88E9D01A-6EA9-4887-8521-22631E4BE71C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88E9D01A-6EA9-4887-8521-22631E4BE71C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88E9D01A-6EA9-4887-8521-22631E4BE71C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2ADC895F-4F19-493B-8F07-67E655D81187}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2ADC895F-4F19-493B-8F07-67E655D81187}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2ADC895F-4F19-493B-8F07-67E655D81187}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2ADC895F-4F19-493B-8F07-67E655D81187}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4980FCF1-1DF9-4961-A8A6-E7CFE594FD2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4980FCF1-1DF9-4961-A8A6-E7CFE594FD2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4980FCF1-1DF9-4961-A8A6-E7CFE594FD2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4980FCF1-1DF9-4961-A8A6-E7CFE594FD2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F87743F9-9B82-49B1-A437-D6149482934A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F87743F9-9B82-49B1-A437-D6149482934A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F87743F9-9B82-49B1-A437-D6149482934A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F87743F9-9B82-49B1-A437-D6149482934A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A979539-78A3-4FDD-9AA6-E388F1A7CC5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A979539-78A3-4FDD-9AA6-E388F1A7CC5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A979539-78A3-4FDD-9AA6-E388F1A7CC5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A979539-78A3-4FDD-9AA6-E388F1A7CC5A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -102,6 +140,14 @@ Global
 		{FE0B5511-A5E1-4E19-A232-B89F628C417E} = {1799B533-6E09-44A9-BF2B-B723ADB5F2F2}
 		{C1FF9F3B-CDD2-493F-ACB6-C630FC5B3034} = {02B8FF7B-DDCB-4A38-A626-39877203DF37}
 		{66B6FD95-517D-47E6-B08B-382EB32DE466} = {02B8FF7B-DDCB-4A38-A626-39877203DF37}
+		{88E9D01A-6EA9-4887-8521-22631E4BE71C} = {EDEBAC03-9968-413D-9545-EE39F2FCC976}
+		{2ADC895F-4F19-493B-8F07-67E655D81187} = {EDEBAC03-9968-413D-9545-EE39F2FCC976}
+		{EDEBAC03-9968-413D-9545-EE39F2FCC976} = {5BB1BD95-3BEC-4B28-93BC-E87275C2D60D}
+		{4980FCF1-1DF9-4961-A8A6-E7CFE594FD2F} = {4216AB28-9056-4C60-9277-57E6E12DEE7B}
+		{F87743F9-9B82-49B1-A437-D6149482934A} = {4216AB28-9056-4C60-9277-57E6E12DEE7B}
+		{4216AB28-9056-4C60-9277-57E6E12DEE7B} = {5BB1BD95-3BEC-4B28-93BC-E87275C2D60D}
+		{4A979539-78A3-4FDD-9AA6-E388F1A7CC5A} = {6EE44BA3-CBC3-4D13-85A5-1FF528F1EEF7}
+		{6EE44BA3-CBC3-4D13-85A5-1FF528F1EEF7} = {5BB1BD95-3BEC-4B28-93BC-E87275C2D60D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BF9E2841-822A-4FDC-B8C5-AF262BB721D6}
diff --git a/src/libraries/System.Collections/System.Collections.sln b/src/libraries/System.Collections/System.Collections.sln
index 2e917f80d7e83..b1f2bf2476b9f 100644
--- a/src/libraries/System.Collections/System.Collections.sln
+++ b/src/libraries/System.Collections/System.Collections.sln
@@ -19,14 +19,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{EE21C87C-5515-45E1-9F94-F11BE4CEE2CA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C848C534-DD16-4A69-81FF-894456E4B099}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{DE25E256-536C-4859-B0DB-9C17DCA2C097}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{CE17728C-AF23-4456-9BB7-DBBD0BB38365}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{66E73FEC-5F49-4DB0-978C-BB808615A31E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{F89047A1-9155-4856-B680-8871CE20E943}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{DFD58F3F-A3F8-4263-9C79-78FC2A01BEF4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6CD2C5E3-B5BA-4219-B8EF-9B5D486BF805}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{06AE90FB-F007-4E70-BCD2-5CAD106A7C97}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C848C534-DD16-4A69-81FF-894456E4B099}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B958B834-96D2-4B18-AA42-22B312BE9925}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{ECAFEE63-F771-4990-B11D-86F64675F943}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{0E027E88-F1D5-4018-8951-67FE144AF36E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{57E49D44-FB9F-44AA-9F0B-95C953920510}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{12FF6366-B3F9-4482-A7C4-1409AF6F97EF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -265,21 +285,134 @@ Global
 		{EE21C87C-5515-45E1-9F94-F11BE4CEE2CA}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{EE21C87C-5515-45E1-9F94-F11BE4CEE2CA}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{EE21C87C-5515-45E1-9F94-F11BE4CEE2CA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Debug|x64.Build.0 = Debug|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Debug|x86.Build.0 = Debug|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Release|arm.ActiveCfg = Release|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Release|x64.ActiveCfg = Release|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Release|x64.Build.0 = Release|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Release|x86.ActiveCfg = Release|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Release|x86.Build.0 = Release|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Debug|x64.Build.0 = Debug|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Debug|x86.Build.0 = Debug|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Release|arm.ActiveCfg = Release|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Release|x64.ActiveCfg = Release|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Release|x64.Build.0 = Release|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Release|x86.ActiveCfg = Release|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Release|x86.Build.0 = Release|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Debug|x64.Build.0 = Debug|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Debug|x86.Build.0 = Debug|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Release|arm.ActiveCfg = Release|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Release|x64.ActiveCfg = Release|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Release|x64.Build.0 = Release|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Release|x86.ActiveCfg = Release|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Release|x86.Build.0 = Release|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Debug|x64.Build.0 = Debug|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Debug|x86.Build.0 = Debug|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Release|arm.ActiveCfg = Release|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Release|x64.ActiveCfg = Release|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Release|x64.Build.0 = Release|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Release|x86.ActiveCfg = Release|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Release|x86.Build.0 = Release|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Debug|x64.Build.0 = Debug|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Debug|x86.Build.0 = Debug|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Release|arm.ActiveCfg = Release|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Release|x64.ActiveCfg = Release|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Release|x64.Build.0 = Release|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Release|x86.ActiveCfg = Release|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Release|x86.Build.0 = Release|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F89047A1-9155-4856-B680-8871CE20E943}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{4385739F-14A1-4F21-96E3-12EA90580575} = {C848C534-DD16-4A69-81FF-894456E4B099}
-		{DF501250-4105-4F79-A508-90B3A13A975A} = {C848C534-DD16-4A69-81FF-894456E4B099}
+		{4385739F-14A1-4F21-96E3-12EA90580575} = {DFD58F3F-A3F8-4263-9C79-78FC2A01BEF4}
 		{38D8F258-655E-459B-B2CE-0DED144AFBF7} = {6CD2C5E3-B5BA-4219-B8EF-9B5D486BF805}
 		{BB54ED9D-FF71-4D91-B7C0-984AB0976798} = {6CD2C5E3-B5BA-4219-B8EF-9B5D486BF805}
 		{77E9C47D-4AC4-4402-8613-40DF427174BD} = {06AE90FB-F007-4E70-BCD2-5CAD106A7C97}
 		{2B114AFB-EB05-4615-B0AC-8FFF0D5D0D13} = {06AE90FB-F007-4E70-BCD2-5CAD106A7C97}
 		{EE21C87C-5515-45E1-9F94-F11BE4CEE2CA} = {06AE90FB-F007-4E70-BCD2-5CAD106A7C97}
+		{DF501250-4105-4F79-A508-90B3A13A975A} = {C848C534-DD16-4A69-81FF-894456E4B099}
 		{F2E57833-4968-430D-8149-733DE03A7314} = {B958B834-96D2-4B18-AA42-22B312BE9925}
 		{389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A} = {B958B834-96D2-4B18-AA42-22B312BE9925}
 		{00398A78-1620-4996-9922-C82D1AF84714} = {B958B834-96D2-4B18-AA42-22B312BE9925}
+		{C5B6496A-65D2-4215-9C55-49F4E3B64FDD} = {ECAFEE63-F771-4990-B11D-86F64675F943}
+		{DE25E256-536C-4859-B0DB-9C17DCA2C097} = {ECAFEE63-F771-4990-B11D-86F64675F943}
+		{ECAFEE63-F771-4990-B11D-86F64675F943} = {12FF6366-B3F9-4482-A7C4-1409AF6F97EF}
+		{CE17728C-AF23-4456-9BB7-DBBD0BB38365} = {0E027E88-F1D5-4018-8951-67FE144AF36E}
+		{66E73FEC-5F49-4DB0-978C-BB808615A31E} = {0E027E88-F1D5-4018-8951-67FE144AF36E}
+		{0E027E88-F1D5-4018-8951-67FE144AF36E} = {12FF6366-B3F9-4482-A7C4-1409AF6F97EF}
+		{F89047A1-9155-4856-B680-8871CE20E943} = {57E49D44-FB9F-44AA-9F0B-95C953920510}
+		{57E49D44-FB9F-44AA-9F0B-95C953920510} = {12FF6366-B3F9-4482-A7C4-1409AF6F97EF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FDD40D53-AF3E-4A20-BE17-7555EB5494F9}
diff --git a/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln b/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
index e779eb57196ef..573c7c6dabd9f 100644
--- a/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
+++ b/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
@@ -27,6 +27,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{B19E6C6F-4950-495D-832B-7C998A5914A8}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{E46F0F08-A4BF-4496-875B-C78D35E97170}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{8B4D69DD-7EF8-428C-B5F1-4815C6D4F9FC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{C8A78752-9B73-4FF6-98B7-6479FC7EB8B9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{B3F664A9-6611-4EBD-B30C-6DF8DD7A9CF2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{DC3C5A99-A276-47C1-B2AB-17EE36410525}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A0596070-E285-49A1-A0AA-187B69E55A39}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{52233040-4669-4A28-8E8F-A35F80039C13}"
@@ -35,6 +45,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E1ABC6C6-D95
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0BCBBCAE-BD70-482D-BA22-916184DB9EE6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{1ABC7D61-CAB5-48D2-979E-CBFE23EC7A2C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{86873B77-50BA-4690-A527-C4562EAE5A1B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{431EB5F6-6BF9-4FED-BE3F-239E89431CCA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{A7035BA8-B608-4D27-AC36-DD3C774247FB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +115,26 @@ Global
 		{B19E6C6F-4950-495D-832B-7C998A5914A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B19E6C6F-4950-495D-832B-7C998A5914A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B19E6C6F-4950-495D-832B-7C998A5914A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E46F0F08-A4BF-4496-875B-C78D35E97170}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E46F0F08-A4BF-4496-875B-C78D35E97170}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E46F0F08-A4BF-4496-875B-C78D35E97170}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E46F0F08-A4BF-4496-875B-C78D35E97170}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B4D69DD-7EF8-428C-B5F1-4815C6D4F9FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B4D69DD-7EF8-428C-B5F1-4815C6D4F9FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B4D69DD-7EF8-428C-B5F1-4815C6D4F9FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B4D69DD-7EF8-428C-B5F1-4815C6D4F9FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8A78752-9B73-4FF6-98B7-6479FC7EB8B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8A78752-9B73-4FF6-98B7-6479FC7EB8B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8A78752-9B73-4FF6-98B7-6479FC7EB8B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8A78752-9B73-4FF6-98B7-6479FC7EB8B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3F664A9-6611-4EBD-B30C-6DF8DD7A9CF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3F664A9-6611-4EBD-B30C-6DF8DD7A9CF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3F664A9-6611-4EBD-B30C-6DF8DD7A9CF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3F664A9-6611-4EBD-B30C-6DF8DD7A9CF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC3C5A99-A276-47C1-B2AB-17EE36410525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC3C5A99-A276-47C1-B2AB-17EE36410525}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC3C5A99-A276-47C1-B2AB-17EE36410525}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC3C5A99-A276-47C1-B2AB-17EE36410525}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -116,6 +154,14 @@ Global
 		{B60893E1-864C-4236-9D4B-F17540DEED86} = {E1ABC6C6-D95F-4452-A9E2-7DAB63667861}
 		{1E2C1B63-290E-409E-ACF8-22E2752D2936} = {0BCBBCAE-BD70-482D-BA22-916184DB9EE6}
 		{FBE888A3-6DCE-4766-A4E4-D1748AC5B688} = {0BCBBCAE-BD70-482D-BA22-916184DB9EE6}
+		{E46F0F08-A4BF-4496-875B-C78D35E97170} = {1ABC7D61-CAB5-48D2-979E-CBFE23EC7A2C}
+		{8B4D69DD-7EF8-428C-B5F1-4815C6D4F9FC} = {1ABC7D61-CAB5-48D2-979E-CBFE23EC7A2C}
+		{1ABC7D61-CAB5-48D2-979E-CBFE23EC7A2C} = {A7035BA8-B608-4D27-AC36-DD3C774247FB}
+		{C8A78752-9B73-4FF6-98B7-6479FC7EB8B9} = {86873B77-50BA-4690-A527-C4562EAE5A1B}
+		{B3F664A9-6611-4EBD-B30C-6DF8DD7A9CF2} = {86873B77-50BA-4690-A527-C4562EAE5A1B}
+		{86873B77-50BA-4690-A527-C4562EAE5A1B} = {A7035BA8-B608-4D27-AC36-DD3C774247FB}
+		{DC3C5A99-A276-47C1-B2AB-17EE36410525} = {431EB5F6-6BF9-4FED-BE3F-239E89431CCA}
+		{431EB5F6-6BF9-4FED-BE3F-239E89431CCA} = {A7035BA8-B608-4D27-AC36-DD3C774247FB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4C1CDE35-7742-40EC-A075-B1ABF99F50B5}
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 9aa76739729f2..cad0a3680df56 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
@@ -15,12 +15,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context",
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{754CEC61-9BD2-469E-868B-84703D12BEC4}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{AFA86D76-CB87-4031-BF82-5B2E091F4CA7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{70C60407-FA4F-47F9-8584-249E5528209D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{39035FBA-DD3B-434C-8E50-BD14EDAC5CC0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{3A398326-BE86-44B6-B643-83B18CBE3010}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{DCB32F49-279C-43C9-B926-C6346870E8BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{31C9A363-248E-4D2E-9C73-C9B670FA03C1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{78F589E7-1830-46C7-AADB-4FD53EE41614}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9CA8C5D2-076D-4505-A79A-CDE929CC62F3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1FE28F13-DE37-48A4-9B43-A32637555165}"
@@ -29,6 +37,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3D168EC8-558
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{9A073A19-15DD-424C-A7B8-1DBEB11E690D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{B083251E-8032-4B8D-A3C6-E54C5307F369}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{1E4C8B99-F64B-4A4F-858E-16B94634F644}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{99F4C5F4-91C8-40DC-8EA0-A1C6D71F3CF7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{D409ADF3-F604-438A-8926-51B39E63667B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,10 +83,6 @@ Global
 		{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
-		{754CEC61-9BD2-469E-868B-84703D12BEC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{754CEC61-9BD2-469E-868B-84703D12BEC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{754CEC61-9BD2-469E-868B-84703D12BEC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{754CEC61-9BD2-469E-868B-84703D12BEC4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AFA86D76-CB87-4031-BF82-5B2E091F4CA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AFA86D76-CB87-4031-BF82-5B2E091F4CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AFA86D76-CB87-4031-BF82-5B2E091F4CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -79,6 +91,26 @@ Global
 		{70C60407-FA4F-47F9-8584-249E5528209D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{70C60407-FA4F-47F9-8584-249E5528209D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{70C60407-FA4F-47F9-8584-249E5528209D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39035FBA-DD3B-434C-8E50-BD14EDAC5CC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39035FBA-DD3B-434C-8E50-BD14EDAC5CC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39035FBA-DD3B-434C-8E50-BD14EDAC5CC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39035FBA-DD3B-434C-8E50-BD14EDAC5CC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A398326-BE86-44B6-B643-83B18CBE3010}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A398326-BE86-44B6-B643-83B18CBE3010}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A398326-BE86-44B6-B643-83B18CBE3010}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A398326-BE86-44B6-B643-83B18CBE3010}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCB32F49-279C-43C9-B926-C6346870E8BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCB32F49-279C-43C9-B926-C6346870E8BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCB32F49-279C-43C9-B926-C6346870E8BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCB32F49-279C-43C9-B926-C6346870E8BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31C9A363-248E-4D2E-9C73-C9B670FA03C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31C9A363-248E-4D2E-9C73-C9B670FA03C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31C9A363-248E-4D2E-9C73-C9B670FA03C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31C9A363-248E-4D2E-9C73-C9B670FA03C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78F589E7-1830-46C7-AADB-4FD53EE41614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78F589E7-1830-46C7-AADB-4FD53EE41614}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78F589E7-1830-46C7-AADB-4FD53EE41614}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78F589E7-1830-46C7-AADB-4FD53EE41614}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -92,9 +124,16 @@ Global
 		{E427BC70-0F51-4DA8-995A-AC46E8E3A31B} = {3D168EC8-5581-468D-BE77-0A787F5042F2}
 		{D598C12E-CFC4-42A8-A6D2-99FC7F527179} = {3D168EC8-5581-468D-BE77-0A787F5042F2}
 		{9154CFB5-AC90-4BC7-BECB-3BB588356ABE} = {3D168EC8-5581-468D-BE77-0A787F5042F2}
-		{754CEC61-9BD2-469E-868B-84703D12BEC4} = {9A073A19-15DD-424C-A7B8-1DBEB11E690D}
 		{AFA86D76-CB87-4031-BF82-5B2E091F4CA7} = {9A073A19-15DD-424C-A7B8-1DBEB11E690D}
 		{70C60407-FA4F-47F9-8584-249E5528209D} = {9A073A19-15DD-424C-A7B8-1DBEB11E690D}
+		{39035FBA-DD3B-434C-8E50-BD14EDAC5CC0} = {B083251E-8032-4B8D-A3C6-E54C5307F369}
+		{3A398326-BE86-44B6-B643-83B18CBE3010} = {B083251E-8032-4B8D-A3C6-E54C5307F369}
+		{B083251E-8032-4B8D-A3C6-E54C5307F369} = {D409ADF3-F604-438A-8926-51B39E63667B}
+		{DCB32F49-279C-43C9-B926-C6346870E8BB} = {1E4C8B99-F64B-4A4F-858E-16B94634F644}
+		{31C9A363-248E-4D2E-9C73-C9B670FA03C1} = {1E4C8B99-F64B-4A4F-858E-16B94634F644}
+		{1E4C8B99-F64B-4A4F-858E-16B94634F644} = {D409ADF3-F604-438A-8926-51B39E63667B}
+		{78F589E7-1830-46C7-AADB-4FD53EE41614} = {99F4C5F4-91C8-40DC-8EA0-A1C6D71F3CF7}
+		{99F4C5F4-91C8-40DC-8EA0-A1C6D71F3CF7} = {D409ADF3-F604-438A-8926-51B39E63667B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {05F0228A-52B7-460E-9A06-9D5A62E33BA6}
diff --git a/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln b/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln
index 9f372e442a71c..45bb16847f6b4 100644
--- a/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln
+++ b/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln
@@ -9,12 +9,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Compo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition.Tests", "tests\System.ComponentModel.Composition.Tests.csproj", "{B21E5872-33E7-40D6-8A7F-33C0264A83E9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{9A1433BA-F516-4DDC-801E-DDF77EC06C78}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2BD2DB5E-FB31-43E3-9184-BEFE59786826}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{90E6CD04-1022-4A7A-B6DD-114C6F61ECA0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{72A42835-4702-4C72-862F-3252C0A0CE82}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{B51D1564-6DE7-470A-86AD-0813F5A848F0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{A7DE660B-44B0-4D95-AE1F-6ED79D85322F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{ACDE4A23-DF27-48DC-B2F1-257D3367EC2C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{EEB3EE91-A896-4BA2-89CB-3400F237CEBC}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E041B502-1C74-4540-9D57-0924674899B0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4857D2B5-405B-490F-BFC8-B730C8A3220A}"
@@ -23,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{56CC716E-A91
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{902418FB-E47F-49F5-BC32-32E9022ECD94}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{B0D89897-4981-4A40-9C6F-C35D89A028C4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{24AD8D2F-D1CC-4339-91BD-1F525C38EA84}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{E6F1CD68-FF51-47C9-9AC4-FC943C1FB9EF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2F3C5A39-FECD-460F-8BA3-52A3B5B73E60}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -49,10 +65,6 @@ Global
 		{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
-		{9A1433BA-F516-4DDC-801E-DDF77EC06C78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A1433BA-F516-4DDC-801E-DDF77EC06C78}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A1433BA-F516-4DDC-801E-DDF77EC06C78}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9A1433BA-F516-4DDC-801E-DDF77EC06C78}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2BD2DB5E-FB31-43E3-9184-BEFE59786826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2BD2DB5E-FB31-43E3-9184-BEFE59786826}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2BD2DB5E-FB31-43E3-9184-BEFE59786826}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,6 +73,26 @@ Global
 		{90E6CD04-1022-4A7A-B6DD-114C6F61ECA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{90E6CD04-1022-4A7A-B6DD-114C6F61ECA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{90E6CD04-1022-4A7A-B6DD-114C6F61ECA0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72A42835-4702-4C72-862F-3252C0A0CE82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72A42835-4702-4C72-862F-3252C0A0CE82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72A42835-4702-4C72-862F-3252C0A0CE82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72A42835-4702-4C72-862F-3252C0A0CE82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B51D1564-6DE7-470A-86AD-0813F5A848F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B51D1564-6DE7-470A-86AD-0813F5A848F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B51D1564-6DE7-470A-86AD-0813F5A848F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B51D1564-6DE7-470A-86AD-0813F5A848F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7DE660B-44B0-4D95-AE1F-6ED79D85322F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7DE660B-44B0-4D95-AE1F-6ED79D85322F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7DE660B-44B0-4D95-AE1F-6ED79D85322F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7DE660B-44B0-4D95-AE1F-6ED79D85322F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ACDE4A23-DF27-48DC-B2F1-257D3367EC2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACDE4A23-DF27-48DC-B2F1-257D3367EC2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ACDE4A23-DF27-48DC-B2F1-257D3367EC2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ACDE4A23-DF27-48DC-B2F1-257D3367EC2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEB3EE91-A896-4BA2-89CB-3400F237CEBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEB3EE91-A896-4BA2-89CB-3400F237CEBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEB3EE91-A896-4BA2-89CB-3400F237CEBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEB3EE91-A896-4BA2-89CB-3400F237CEBC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -71,9 +103,16 @@ Global
 		{B21E5872-33E7-40D6-8A7F-33C0264A83E9} = {E041B502-1C74-4540-9D57-0924674899B0}
 		{82F98B94-4E9D-457B-A391-F8F2766FBB2E} = {4857D2B5-405B-490F-BFC8-B730C8A3220A}
 		{B1B4D6FA-25CA-4F88-A7B4-BEADC53E9613} = {56CC716E-A917-46F2-8238-D809E1AF9D17}
-		{9A1433BA-F516-4DDC-801E-DDF77EC06C78} = {902418FB-E47F-49F5-BC32-32E9022ECD94}
 		{2BD2DB5E-FB31-43E3-9184-BEFE59786826} = {902418FB-E47F-49F5-BC32-32E9022ECD94}
 		{90E6CD04-1022-4A7A-B6DD-114C6F61ECA0} = {902418FB-E47F-49F5-BC32-32E9022ECD94}
+		{72A42835-4702-4C72-862F-3252C0A0CE82} = {B0D89897-4981-4A40-9C6F-C35D89A028C4}
+		{B51D1564-6DE7-470A-86AD-0813F5A848F0} = {B0D89897-4981-4A40-9C6F-C35D89A028C4}
+		{B0D89897-4981-4A40-9C6F-C35D89A028C4} = {2F3C5A39-FECD-460F-8BA3-52A3B5B73E60}
+		{A7DE660B-44B0-4D95-AE1F-6ED79D85322F} = {24AD8D2F-D1CC-4339-91BD-1F525C38EA84}
+		{ACDE4A23-DF27-48DC-B2F1-257D3367EC2C} = {24AD8D2F-D1CC-4339-91BD-1F525C38EA84}
+		{24AD8D2F-D1CC-4339-91BD-1F525C38EA84} = {2F3C5A39-FECD-460F-8BA3-52A3B5B73E60}
+		{EEB3EE91-A896-4BA2-89CB-3400F237CEBC} = {E6F1CD68-FF51-47C9-9AC4-FC943C1FB9EF}
+		{E6F1CD68-FF51-47C9-9AC4-FC943C1FB9EF} = {2F3C5A39-FECD-460F-8BA3-52A3B5B73E60}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7852190A-F724-4BBB-969F-ECD086712D41}
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln b/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
index 3d605a9258862..380c34d65a976 100644
--- a/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
@@ -25,6 +25,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\ref\System.Threading.csproj", "{BC901D3C-2411-450F-9388-82989E188C44}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{561B4C1F-875F-43FB-A069-3CC73D47E675}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{A211DB21-34D0-4256-BF48-EA8EE9E74674}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{043B296D-16B7-43C8-9310-7B88F659A2CC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{0435CAF2-AD99-4907-81FA-CF4C2FE3C7E6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{C2515761-21C6-4429-B0EE-8FD3F90841CC}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{53E9D5BA-677C-487C-A58E-A9C6622D8C0D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8F9719E0-3A02-421C-B564-64559817B4A7}"
@@ -33,6 +43,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EEC4342D-1B9
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B2151F7B-8333-4467-B311-145FAD7BC484}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{C21AB887-8CD7-4FEB-A348-AA43A527CD36}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{1F8254CA-2213-41EF-AF8E-5E02F5D4E60D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{CA31A221-4C3D-4C90-B4AA-DB143FCA0096}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0D8DBD5D-8038-49E4-92D7-653897627F12}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,6 +109,26 @@ Global
 		{BC901D3C-2411-450F-9388-82989E188C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BC901D3C-2411-450F-9388-82989E188C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BC901D3C-2411-450F-9388-82989E188C44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{561B4C1F-875F-43FB-A069-3CC73D47E675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{561B4C1F-875F-43FB-A069-3CC73D47E675}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{561B4C1F-875F-43FB-A069-3CC73D47E675}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{561B4C1F-875F-43FB-A069-3CC73D47E675}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A211DB21-34D0-4256-BF48-EA8EE9E74674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A211DB21-34D0-4256-BF48-EA8EE9E74674}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A211DB21-34D0-4256-BF48-EA8EE9E74674}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A211DB21-34D0-4256-BF48-EA8EE9E74674}.Release|Any CPU.Build.0 = Release|Any CPU
+		{043B296D-16B7-43C8-9310-7B88F659A2CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{043B296D-16B7-43C8-9310-7B88F659A2CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{043B296D-16B7-43C8-9310-7B88F659A2CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{043B296D-16B7-43C8-9310-7B88F659A2CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0435CAF2-AD99-4907-81FA-CF4C2FE3C7E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0435CAF2-AD99-4907-81FA-CF4C2FE3C7E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0435CAF2-AD99-4907-81FA-CF4C2FE3C7E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0435CAF2-AD99-4907-81FA-CF4C2FE3C7E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2515761-21C6-4429-B0EE-8FD3F90841CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2515761-21C6-4429-B0EE-8FD3F90841CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2515761-21C6-4429-B0EE-8FD3F90841CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2515761-21C6-4429-B0EE-8FD3F90841CC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -109,6 +147,14 @@ Global
 		{04E0F296-DF67-45EB-8967-DADF4CBC9D6E} = {EEC4342D-1B9E-462C-98FE-2C8BC16B75BE}
 		{DD873B5A-85F5-4C40-A33F-C998F5B5409D} = {B2151F7B-8333-4467-B311-145FAD7BC484}
 		{AA09E7A5-58F5-4BAB-B6EE-B594F50C17E2} = {B2151F7B-8333-4467-B311-145FAD7BC484}
+		{561B4C1F-875F-43FB-A069-3CC73D47E675} = {C21AB887-8CD7-4FEB-A348-AA43A527CD36}
+		{A211DB21-34D0-4256-BF48-EA8EE9E74674} = {C21AB887-8CD7-4FEB-A348-AA43A527CD36}
+		{C21AB887-8CD7-4FEB-A348-AA43A527CD36} = {0D8DBD5D-8038-49E4-92D7-653897627F12}
+		{043B296D-16B7-43C8-9310-7B88F659A2CC} = {1F8254CA-2213-41EF-AF8E-5E02F5D4E60D}
+		{0435CAF2-AD99-4907-81FA-CF4C2FE3C7E6} = {1F8254CA-2213-41EF-AF8E-5E02F5D4E60D}
+		{1F8254CA-2213-41EF-AF8E-5E02F5D4E60D} = {0D8DBD5D-8038-49E4-92D7-653897627F12}
+		{C2515761-21C6-4429-B0EE-8FD3F90841CC} = {CA31A221-4C3D-4C90-B4AA-DB143FCA0096}
+		{CA31A221-4C3D-4C90-B4AA-DB143FCA0096} = {0D8DBD5D-8038-49E4-92D7-653897627F12}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {29FF2FD6-28B0-4B47-B6E4-A170FD327623}
diff --git a/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln b/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
index 28bd7f7aac777..77cea00a0679d 100644
--- a/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
+++ b/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
@@ -21,6 +21,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{1B341E00-2D7F-496B-B905-AF508EF41A91}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{26DCFFF8-A1AD-4682-ABC1-9FC9DF35C431}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{2E0222A0-8756-4377-845A-2E41AEA621E3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{26EF7A47-E428-4CF4-9CA6-7B516BFD1088}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{CC6FB402-D808-4313-B4AF-7907D0C59CA4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{2C72B24A-21F2-4EEC-94AC-A17BB5F42AE5}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{97E28BF9-DD92-440D-B9AD-AEE3454C07A5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4D0700F8-3BC3-4CE5-8258-1004C0BD007D}"
@@ -29,6 +39,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F199F24A-640
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2D5F3044-9A0F-46C5-B714-7816F501604F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{17F1014E-DBFF-4CF1-9C8B-A8080658B433}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D3E3E44F-C7A3-445A-984B-31BA334523FA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{5DEE6137-8716-438F-A3F2-002AA08A4B82}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{07DC4EF5-44FE-4E4B-81E3-1EAD8C623CC2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,6 +97,26 @@ Global
 		{1B341E00-2D7F-496B-B905-AF508EF41A91}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1B341E00-2D7F-496B-B905-AF508EF41A91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B341E00-2D7F-496B-B905-AF508EF41A91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26DCFFF8-A1AD-4682-ABC1-9FC9DF35C431}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26DCFFF8-A1AD-4682-ABC1-9FC9DF35C431}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26DCFFF8-A1AD-4682-ABC1-9FC9DF35C431}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26DCFFF8-A1AD-4682-ABC1-9FC9DF35C431}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E0222A0-8756-4377-845A-2E41AEA621E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E0222A0-8756-4377-845A-2E41AEA621E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E0222A0-8756-4377-845A-2E41AEA621E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E0222A0-8756-4377-845A-2E41AEA621E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26EF7A47-E428-4CF4-9CA6-7B516BFD1088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26EF7A47-E428-4CF4-9CA6-7B516BFD1088}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26EF7A47-E428-4CF4-9CA6-7B516BFD1088}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26EF7A47-E428-4CF4-9CA6-7B516BFD1088}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC6FB402-D808-4313-B4AF-7907D0C59CA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC6FB402-D808-4313-B4AF-7907D0C59CA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC6FB402-D808-4313-B4AF-7907D0C59CA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC6FB402-D808-4313-B4AF-7907D0C59CA4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C72B24A-21F2-4EEC-94AC-A17BB5F42AE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C72B24A-21F2-4EEC-94AC-A17BB5F42AE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C72B24A-21F2-4EEC-94AC-A17BB5F42AE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C72B24A-21F2-4EEC-94AC-A17BB5F42AE5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -95,6 +133,14 @@ Global
 		{E6024DD2-79AD-4639-A141-9DA38282F61B} = {F199F24A-6408-4204-84CF-7A2C9ED758CA}
 		{E8CC2715-0EA3-4ADC-9896-508FB1E7349A} = {2D5F3044-9A0F-46C5-B714-7816F501604F}
 		{BE0F37D2-BEF7-4365-AFFB-B08271D25844} = {2D5F3044-9A0F-46C5-B714-7816F501604F}
+		{26DCFFF8-A1AD-4682-ABC1-9FC9DF35C431} = {17F1014E-DBFF-4CF1-9C8B-A8080658B433}
+		{2E0222A0-8756-4377-845A-2E41AEA621E3} = {17F1014E-DBFF-4CF1-9C8B-A8080658B433}
+		{17F1014E-DBFF-4CF1-9C8B-A8080658B433} = {07DC4EF5-44FE-4E4B-81E3-1EAD8C623CC2}
+		{26EF7A47-E428-4CF4-9CA6-7B516BFD1088} = {D3E3E44F-C7A3-445A-984B-31BA334523FA}
+		{CC6FB402-D808-4313-B4AF-7907D0C59CA4} = {D3E3E44F-C7A3-445A-984B-31BA334523FA}
+		{D3E3E44F-C7A3-445A-984B-31BA334523FA} = {07DC4EF5-44FE-4E4B-81E3-1EAD8C623CC2}
+		{2C72B24A-21F2-4EEC-94AC-A17BB5F42AE5} = {5DEE6137-8716-438F-A3F2-002AA08A4B82}
+		{5DEE6137-8716-438F-A3F2-002AA08A4B82} = {07DC4EF5-44FE-4E4B-81E3-1EAD8C623CC2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D4ED660D-B8E6-404D-B0B0-C7A31244A916}
diff --git a/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln b/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
index fe297a846d4d2..e033bb82d481e 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
+++ b/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
@@ -29,6 +29,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Generator", "..\System.Text.RegularExpressions\gen\System.Text.RegularExpressions.Generator.csproj", "{B681D74E-6DAD-4C73-9EEF-CB1C17063E32}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{2B00B94A-91A7-445F-A1B5-E24FA25C10E0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{FB3C7146-8622-418A-8D8B-AE819738E0B3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{945372C6-9242-441A-BFCD-4404F74FF95C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{EDA39F11-6F85-4E4D-93D3-E178AC13F3FE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{C4C8D5AF-7402-4C82-BB99-B8EB18A52E8A}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E80037BD-B4E3-43B7-A7C8-F6C3C6DA4EF8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2F8CF65B-8616-42BC-A893-8C7C9FD990C5}"
@@ -37,6 +47,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CD3CE573-098
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D06EAE06-636A-4A7A-B22F-5D106F7CCC75}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{1DF76A2A-9700-4D63-8F6F-2DFCA289E70E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{82259970-A9FA-4264-A47F-7B697B317AE6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{0507C945-5BC2-4234-AF07-D766E2CCCDEC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{4690D584-4BB0-4C37-9887-6ED204389F4D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -103,6 +121,26 @@ Global
 		{B681D74E-6DAD-4C73-9EEF-CB1C17063E32}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B681D74E-6DAD-4C73-9EEF-CB1C17063E32}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B681D74E-6DAD-4C73-9EEF-CB1C17063E32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B00B94A-91A7-445F-A1B5-E24FA25C10E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B00B94A-91A7-445F-A1B5-E24FA25C10E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B00B94A-91A7-445F-A1B5-E24FA25C10E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B00B94A-91A7-445F-A1B5-E24FA25C10E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB3C7146-8622-418A-8D8B-AE819738E0B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB3C7146-8622-418A-8D8B-AE819738E0B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB3C7146-8622-418A-8D8B-AE819738E0B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB3C7146-8622-418A-8D8B-AE819738E0B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{945372C6-9242-441A-BFCD-4404F74FF95C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{945372C6-9242-441A-BFCD-4404F74FF95C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{945372C6-9242-441A-BFCD-4404F74FF95C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{945372C6-9242-441A-BFCD-4404F74FF95C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDA39F11-6F85-4E4D-93D3-E178AC13F3FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDA39F11-6F85-4E4D-93D3-E178AC13F3FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDA39F11-6F85-4E4D-93D3-E178AC13F3FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDA39F11-6F85-4E4D-93D3-E178AC13F3FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4C8D5AF-7402-4C82-BB99-B8EB18A52E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4C8D5AF-7402-4C82-BB99-B8EB18A52E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4C8D5AF-7402-4C82-BB99-B8EB18A52E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4C8D5AF-7402-4C82-BB99-B8EB18A52E8A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -123,6 +161,14 @@ Global
 		{113EA49F-2525-47A0-AD4D-EA510476F50B} = {D06EAE06-636A-4A7A-B22F-5D106F7CCC75}
 		{970B0849-990C-4368-B317-063BFD82CAD5} = {D06EAE06-636A-4A7A-B22F-5D106F7CCC75}
 		{B681D74E-6DAD-4C73-9EEF-CB1C17063E32} = {D06EAE06-636A-4A7A-B22F-5D106F7CCC75}
+		{2B00B94A-91A7-445F-A1B5-E24FA25C10E0} = {1DF76A2A-9700-4D63-8F6F-2DFCA289E70E}
+		{FB3C7146-8622-418A-8D8B-AE819738E0B3} = {1DF76A2A-9700-4D63-8F6F-2DFCA289E70E}
+		{1DF76A2A-9700-4D63-8F6F-2DFCA289E70E} = {4690D584-4BB0-4C37-9887-6ED204389F4D}
+		{945372C6-9242-441A-BFCD-4404F74FF95C} = {82259970-A9FA-4264-A47F-7B697B317AE6}
+		{EDA39F11-6F85-4E4D-93D3-E178AC13F3FE} = {82259970-A9FA-4264-A47F-7B697B317AE6}
+		{82259970-A9FA-4264-A47F-7B697B317AE6} = {4690D584-4BB0-4C37-9887-6ED204389F4D}
+		{C4C8D5AF-7402-4C82-BB99-B8EB18A52E8A} = {0507C945-5BC2-4234-AF07-D766E2CCCDEC}
+		{0507C945-5BC2-4234-AF07-D766E2CCCDEC} = {4690D584-4BB0-4C37-9887-6ED204389F4D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1D4639D9-A4BD-410A-9491-E5F8D82DE8BF}
diff --git a/src/libraries/System.ComponentModel/System.ComponentModel.sln b/src/libraries/System.ComponentModel/System.ComponentModel.sln
index c9fe1462e5c18..bbf9c64dccf07 100644
--- a/src/libraries/System.ComponentModel/System.ComponentModel.sln
+++ b/src/libraries/System.ComponentModel/System.ComponentModel.sln
@@ -13,6 +13,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{5113780E-0A6C-42A2-94E0-A019815E051C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{DE549F9A-F3EC-4F34-872A-1B0867108D76}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{B341755D-DE06-4626-9CF0-3C6F510EC598}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{78706D8B-82FD-4F2D-81E9-32F75FD8BC45}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{05688035-8175-455C-9BF8-7DD2855E76D8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{3541B932-20F2-4F4E-8C47-878DB90E53A9}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{70E2F273-4083-402A-8AC4-4DB08A09813B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C6EF640A-0AED-46F1-97D6-3206BD0186F0}"
@@ -21,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{797FC0E7-178
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C3164BD9-1105-4795-B05D-3F2583479C41}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{F8EA386B-5A35-4416-83D9-AB77469F8F86}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{58B09026-5164-4CA9-90A2-2A5833529314}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{7C8D6ADC-AF7B-473D-8347-A96A67480DB3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{8EE58110-F57C-4A9F-933C-0DE3544F12C5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +73,26 @@ Global
 		{5113780E-0A6C-42A2-94E0-A019815E051C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5113780E-0A6C-42A2-94E0-A019815E051C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5113780E-0A6C-42A2-94E0-A019815E051C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE549F9A-F3EC-4F34-872A-1B0867108D76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE549F9A-F3EC-4F34-872A-1B0867108D76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE549F9A-F3EC-4F34-872A-1B0867108D76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE549F9A-F3EC-4F34-872A-1B0867108D76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B341755D-DE06-4626-9CF0-3C6F510EC598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B341755D-DE06-4626-9CF0-3C6F510EC598}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B341755D-DE06-4626-9CF0-3C6F510EC598}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B341755D-DE06-4626-9CF0-3C6F510EC598}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78706D8B-82FD-4F2D-81E9-32F75FD8BC45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78706D8B-82FD-4F2D-81E9-32F75FD8BC45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78706D8B-82FD-4F2D-81E9-32F75FD8BC45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78706D8B-82FD-4F2D-81E9-32F75FD8BC45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05688035-8175-455C-9BF8-7DD2855E76D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05688035-8175-455C-9BF8-7DD2855E76D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05688035-8175-455C-9BF8-7DD2855E76D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05688035-8175-455C-9BF8-7DD2855E76D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3541B932-20F2-4F4E-8C47-878DB90E53A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3541B932-20F2-4F4E-8C47-878DB90E53A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3541B932-20F2-4F4E-8C47-878DB90E53A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3541B932-20F2-4F4E-8C47-878DB90E53A9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -67,6 +105,14 @@ Global
 		{EFFECBCD-A544-4649-AF79-3C2A7EEB4C6F} = {797FC0E7-1785-46B3-B280-2992A716A4ED}
 		{AD87AB87-946C-4297-8ACB-C8FB1B604DE7} = {C3164BD9-1105-4795-B05D-3F2583479C41}
 		{22E91D96-49E2-4691-B4E5-4C22938C2F2A} = {C3164BD9-1105-4795-B05D-3F2583479C41}
+		{DE549F9A-F3EC-4F34-872A-1B0867108D76} = {F8EA386B-5A35-4416-83D9-AB77469F8F86}
+		{B341755D-DE06-4626-9CF0-3C6F510EC598} = {F8EA386B-5A35-4416-83D9-AB77469F8F86}
+		{F8EA386B-5A35-4416-83D9-AB77469F8F86} = {8EE58110-F57C-4A9F-933C-0DE3544F12C5}
+		{78706D8B-82FD-4F2D-81E9-32F75FD8BC45} = {58B09026-5164-4CA9-90A2-2A5833529314}
+		{05688035-8175-455C-9BF8-7DD2855E76D8} = {58B09026-5164-4CA9-90A2-2A5833529314}
+		{58B09026-5164-4CA9-90A2-2A5833529314} = {8EE58110-F57C-4A9F-933C-0DE3544F12C5}
+		{3541B932-20F2-4F4E-8C47-878DB90E53A9} = {7C8D6ADC-AF7B-473D-8347-A96A67480DB3}
+		{7C8D6ADC-AF7B-473D-8347-A96A67480DB3} = {8EE58110-F57C-4A9F-933C-0DE3544F12C5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F6E6B62A-C9F6-4CF9-BFC4-F169919B707A}
diff --git a/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln b/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
index f7a3afe6a72a5..5b4c3b4bda941 100644
--- a/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
+++ b/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
@@ -9,12 +9,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Attribut
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{F8A6A1C8-95B6-46AF-BF9C-E150C2D16A2F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{24833E1B-95AF-4BB0-A290-5C6C79B3517F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1167919A-CDD3-4EBB-9659-A2515B8D81D5}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{136A85A5-AF8F-460F-A600-E0D8DB744502}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{E2101146-2E02-4FCC-8926-1E72026A40B4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{284CC03D-0F28-4FEF-A95E-B4DA873DF34A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{D4E43DAE-A23C-44F9-A082-89E11EF50CA9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{47AF0BAB-7ED6-4DEF-B437-E65F00F762A9}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E942B629-51B4-4435-9045-80D88603DE00}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5D6DA61D-2DBA-49B9-A8D0-1566890D3293}"
@@ -23,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{378856D0-332
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{4E66055C-EBEE-4A40-BA5C-EDC98CEE758E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{721AA8C2-0353-4E97-84AF-552621DF84BD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{95863F56-C4E8-4310-9B23-5D093697E1FD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{B6C6CADC-D805-4823-AB12-35E6B37AFE83}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{5A77E69D-DE4B-4F98-96C3-99EB76EB9482}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -49,10 +65,6 @@ Global
 		{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
-		{F8A6A1C8-95B6-46AF-BF9C-E150C2D16A2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8A6A1C8-95B6-46AF-BF9C-E150C2D16A2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8A6A1C8-95B6-46AF-BF9C-E150C2D16A2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8A6A1C8-95B6-46AF-BF9C-E150C2D16A2F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{24833E1B-95AF-4BB0-A290-5C6C79B3517F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{24833E1B-95AF-4BB0-A290-5C6C79B3517F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{24833E1B-95AF-4BB0-A290-5C6C79B3517F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,6 +73,26 @@ Global
 		{1167919A-CDD3-4EBB-9659-A2515B8D81D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1167919A-CDD3-4EBB-9659-A2515B8D81D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1167919A-CDD3-4EBB-9659-A2515B8D81D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{136A85A5-AF8F-460F-A600-E0D8DB744502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{136A85A5-AF8F-460F-A600-E0D8DB744502}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{136A85A5-AF8F-460F-A600-E0D8DB744502}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{136A85A5-AF8F-460F-A600-E0D8DB744502}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2101146-2E02-4FCC-8926-1E72026A40B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2101146-2E02-4FCC-8926-1E72026A40B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2101146-2E02-4FCC-8926-1E72026A40B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2101146-2E02-4FCC-8926-1E72026A40B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{284CC03D-0F28-4FEF-A95E-B4DA873DF34A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{284CC03D-0F28-4FEF-A95E-B4DA873DF34A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{284CC03D-0F28-4FEF-A95E-B4DA873DF34A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{284CC03D-0F28-4FEF-A95E-B4DA873DF34A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4E43DAE-A23C-44F9-A082-89E11EF50CA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4E43DAE-A23C-44F9-A082-89E11EF50CA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4E43DAE-A23C-44F9-A082-89E11EF50CA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4E43DAE-A23C-44F9-A082-89E11EF50CA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47AF0BAB-7ED6-4DEF-B437-E65F00F762A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47AF0BAB-7ED6-4DEF-B437-E65F00F762A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47AF0BAB-7ED6-4DEF-B437-E65F00F762A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47AF0BAB-7ED6-4DEF-B437-E65F00F762A9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -71,9 +103,16 @@ Global
 		{B62DF545-08AB-40E1-9DED-755583B0B3B3} = {5D6DA61D-2DBA-49B9-A8D0-1566890D3293}
 		{7C81E44B-A3A6-4707-AC60-8B6452FE35C2} = {378856D0-3326-428C-A8FB-FF958D0C4D49}
 		{3DD99E03-A4D3-456A-BA2F-A7351423B800} = {378856D0-3326-428C-A8FB-FF958D0C4D49}
-		{F8A6A1C8-95B6-46AF-BF9C-E150C2D16A2F} = {4E66055C-EBEE-4A40-BA5C-EDC98CEE758E}
 		{24833E1B-95AF-4BB0-A290-5C6C79B3517F} = {4E66055C-EBEE-4A40-BA5C-EDC98CEE758E}
 		{1167919A-CDD3-4EBB-9659-A2515B8D81D5} = {4E66055C-EBEE-4A40-BA5C-EDC98CEE758E}
+		{136A85A5-AF8F-460F-A600-E0D8DB744502} = {721AA8C2-0353-4E97-84AF-552621DF84BD}
+		{E2101146-2E02-4FCC-8926-1E72026A40B4} = {721AA8C2-0353-4E97-84AF-552621DF84BD}
+		{721AA8C2-0353-4E97-84AF-552621DF84BD} = {5A77E69D-DE4B-4F98-96C3-99EB76EB9482}
+		{284CC03D-0F28-4FEF-A95E-B4DA873DF34A} = {95863F56-C4E8-4310-9B23-5D093697E1FD}
+		{D4E43DAE-A23C-44F9-A082-89E11EF50CA9} = {95863F56-C4E8-4310-9B23-5D093697E1FD}
+		{95863F56-C4E8-4310-9B23-5D093697E1FD} = {5A77E69D-DE4B-4F98-96C3-99EB76EB9482}
+		{47AF0BAB-7ED6-4DEF-B437-E65F00F762A9} = {B6C6CADC-D805-4823-AB12-35E6B37AFE83}
+		{B6C6CADC-D805-4823-AB12-35E6B37AFE83} = {5A77E69D-DE4B-4F98-96C3-99EB76EB9482}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0C208CE9-53A6-4D20-9851-9D565EC19AAD}
diff --git a/src/libraries/System.Composition.Convention/System.Composition.Convention.sln b/src/libraries/System.Composition.Convention/System.Composition.Convention.sln
index d00176a21de24..a9205e23a8667 100644
--- a/src/libraries/System.Composition.Convention/System.Composition.Convention.sln
+++ b/src/libraries/System.Composition.Convention/System.Composition.Convention.sln
@@ -13,18 +13,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime"
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{B82B46DB-D4FB-4D28-BC57-158C44B101F5}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{0E526574-8462-4D78-BBCA-BD761904574A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{5D902FB1-35C6-4396-98B2-CBC0BF09F356}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{7F5928C7-00A1-4786-9916-F58A60ADEAEC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{9CFB3C11-E653-4969-8B4C-135E4E20E6C8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{B154C49B-FA17-4748-8294-BDBF85FA6463}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{DEA5DBD4-2491-492A-8BDC-E5B1B1DDF499}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{E1802CDE-A06A-4056-B2D7-52A0B880120D}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2AB71E3F-3402-4537-AEF4-85EDB7FCA321}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D6A9A080-5B74-41A2-871E-F417FA9FF705}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{DDADB978-93BC-489A-90C8-523AFE08EBC1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0690F4F7-22B9-4290-9223-6D8622F18445}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{2E284C80-BF26-42B1-9EB3-D7C0B1BCC1D0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{0580E5D2-3D9F-4F84-987F-2A6B064DA7FC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2FCBF158-825B-4337-8C4A-AAD8BF181049}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -59,10 +75,6 @@ Global
 		{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
-		{B82B46DB-D4FB-4D28-BC57-158C44B101F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B82B46DB-D4FB-4D28-BC57-158C44B101F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B82B46DB-D4FB-4D28-BC57-158C44B101F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B82B46DB-D4FB-4D28-BC57-158C44B101F5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0E526574-8462-4D78-BBCA-BD761904574A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0E526574-8462-4D78-BBCA-BD761904574A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0E526574-8462-4D78-BBCA-BD761904574A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -71,6 +83,26 @@ Global
 		{5D902FB1-35C6-4396-98B2-CBC0BF09F356}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5D902FB1-35C6-4396-98B2-CBC0BF09F356}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5D902FB1-35C6-4396-98B2-CBC0BF09F356}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F5928C7-00A1-4786-9916-F58A60ADEAEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F5928C7-00A1-4786-9916-F58A60ADEAEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F5928C7-00A1-4786-9916-F58A60ADEAEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F5928C7-00A1-4786-9916-F58A60ADEAEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CFB3C11-E653-4969-8B4C-135E4E20E6C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CFB3C11-E653-4969-8B4C-135E4E20E6C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CFB3C11-E653-4969-8B4C-135E4E20E6C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CFB3C11-E653-4969-8B4C-135E4E20E6C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B154C49B-FA17-4748-8294-BDBF85FA6463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B154C49B-FA17-4748-8294-BDBF85FA6463}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B154C49B-FA17-4748-8294-BDBF85FA6463}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B154C49B-FA17-4748-8294-BDBF85FA6463}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DEA5DBD4-2491-492A-8BDC-E5B1B1DDF499}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEA5DBD4-2491-492A-8BDC-E5B1B1DDF499}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEA5DBD4-2491-492A-8BDC-E5B1B1DDF499}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEA5DBD4-2491-492A-8BDC-E5B1B1DDF499}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1802CDE-A06A-4056-B2D7-52A0B880120D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1802CDE-A06A-4056-B2D7-52A0B880120D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1802CDE-A06A-4056-B2D7-52A0B880120D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1802CDE-A06A-4056-B2D7-52A0B880120D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -83,9 +115,16 @@ Global
 		{7839BCF8-8B5A-465B-A4B6-86CE4227AF81} = {D6A9A080-5B74-41A2-871E-F417FA9FF705}
 		{782AA503-8808-4741-AECF-D79A6BF3EFF7} = {D6A9A080-5B74-41A2-871E-F417FA9FF705}
 		{5AAFDB16-AACF-4446-9285-26AAC815101B} = {D6A9A080-5B74-41A2-871E-F417FA9FF705}
-		{B82B46DB-D4FB-4D28-BC57-158C44B101F5} = {DDADB978-93BC-489A-90C8-523AFE08EBC1}
 		{0E526574-8462-4D78-BBCA-BD761904574A} = {DDADB978-93BC-489A-90C8-523AFE08EBC1}
 		{5D902FB1-35C6-4396-98B2-CBC0BF09F356} = {DDADB978-93BC-489A-90C8-523AFE08EBC1}
+		{7F5928C7-00A1-4786-9916-F58A60ADEAEC} = {0690F4F7-22B9-4290-9223-6D8622F18445}
+		{9CFB3C11-E653-4969-8B4C-135E4E20E6C8} = {0690F4F7-22B9-4290-9223-6D8622F18445}
+		{0690F4F7-22B9-4290-9223-6D8622F18445} = {2FCBF158-825B-4337-8C4A-AAD8BF181049}
+		{B154C49B-FA17-4748-8294-BDBF85FA6463} = {2E284C80-BF26-42B1-9EB3-D7C0B1BCC1D0}
+		{DEA5DBD4-2491-492A-8BDC-E5B1B1DDF499} = {2E284C80-BF26-42B1-9EB3-D7C0B1BCC1D0}
+		{2E284C80-BF26-42B1-9EB3-D7C0B1BCC1D0} = {2FCBF158-825B-4337-8C4A-AAD8BF181049}
+		{E1802CDE-A06A-4056-B2D7-52A0B880120D} = {0580E5D2-3D9F-4F84-987F-2A6B064DA7FC}
+		{0580E5D2-3D9F-4F84-987F-2A6B064DA7FC} = {2FCBF158-825B-4337-8C4A-AAD8BF181049}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3F85CAA1-0651-4FD6-81E7-45CFF63779BA}
diff --git a/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln b/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln
index 9b2316b2aa0f2..0a2ca82bef762 100644
--- a/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln
+++ b/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln
@@ -7,18 +7,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Hosting.
 EndProject
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{5C6BC85E-AA23-472D-ACB5-74F0813D5D68}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{FD8449C3-8A72-4ECF-B85D-C920253B88D8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{5DBEE1CE-A97E-4F4A-98FF-DD689E5EF629}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{576EC47D-A253-424B-8695-40257B07B282}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{4DED17FD-82E0-4566-932A-1371911AD33A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{6175C4F1-F6F8-49E8-A00C-045858790DBF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{BC655B2E-62F7-46EC-9A9C-7AEFFEEE53CB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{630B7AC3-2028-4423-AB99-8DA96CA33ABA}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7AEF3556-BD3A-432D-A849-DFE1509F905E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D140917D-0E52-4DC6-920A-B222BD2025AE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{1EEFB4CE-0917-418F-B83C-3B376CB39BC4}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{E3B907A0-538F-47D6-B89A-9701F6D4B382}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{6F953E17-B84D-41F3-909E-519EB4B1D021}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{5983845B-0248-40D9-8F36-A76043C7F30B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2EE736A9-1E7E-4F8D-A584-26E71E13DB86}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +57,6 @@ Global
 		{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
-		{5C6BC85E-AA23-472D-ACB5-74F0813D5D68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C6BC85E-AA23-472D-ACB5-74F0813D5D68}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C6BC85E-AA23-472D-ACB5-74F0813D5D68}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5C6BC85E-AA23-472D-ACB5-74F0813D5D68}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FD8449C3-8A72-4ECF-B85D-C920253B88D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD8449C3-8A72-4ECF-B85D-C920253B88D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD8449C3-8A72-4ECF-B85D-C920253B88D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -53,6 +65,26 @@ Global
 		{5DBEE1CE-A97E-4F4A-98FF-DD689E5EF629}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5DBEE1CE-A97E-4F4A-98FF-DD689E5EF629}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5DBEE1CE-A97E-4F4A-98FF-DD689E5EF629}.Release|Any CPU.Build.0 = Release|Any CPU
+		{576EC47D-A253-424B-8695-40257B07B282}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{576EC47D-A253-424B-8695-40257B07B282}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{576EC47D-A253-424B-8695-40257B07B282}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{576EC47D-A253-424B-8695-40257B07B282}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DED17FD-82E0-4566-932A-1371911AD33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DED17FD-82E0-4566-932A-1371911AD33A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DED17FD-82E0-4566-932A-1371911AD33A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4DED17FD-82E0-4566-932A-1371911AD33A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6175C4F1-F6F8-49E8-A00C-045858790DBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6175C4F1-F6F8-49E8-A00C-045858790DBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6175C4F1-F6F8-49E8-A00C-045858790DBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6175C4F1-F6F8-49E8-A00C-045858790DBF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC655B2E-62F7-46EC-9A9C-7AEFFEEE53CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC655B2E-62F7-46EC-9A9C-7AEFFEEE53CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC655B2E-62F7-46EC-9A9C-7AEFFEEE53CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC655B2E-62F7-46EC-9A9C-7AEFFEEE53CB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{630B7AC3-2028-4423-AB99-8DA96CA33ABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{630B7AC3-2028-4423-AB99-8DA96CA33ABA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{630B7AC3-2028-4423-AB99-8DA96CA33ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{630B7AC3-2028-4423-AB99-8DA96CA33ABA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -62,9 +94,16 @@ Global
 		{0F595512-D4BE-4042-9C8A-F0816A7B27AD} = {7AEF3556-BD3A-432D-A849-DFE1509F905E}
 		{991FC8D9-6A92-4A79-91EC-BD72005687AF} = {D140917D-0E52-4DC6-920A-B222BD2025AE}
 		{4C5E5AB8-480F-49F2-AF28-29C2EE713A39} = {D140917D-0E52-4DC6-920A-B222BD2025AE}
-		{5C6BC85E-AA23-472D-ACB5-74F0813D5D68} = {1EEFB4CE-0917-418F-B83C-3B376CB39BC4}
 		{FD8449C3-8A72-4ECF-B85D-C920253B88D8} = {1EEFB4CE-0917-418F-B83C-3B376CB39BC4}
 		{5DBEE1CE-A97E-4F4A-98FF-DD689E5EF629} = {1EEFB4CE-0917-418F-B83C-3B376CB39BC4}
+		{576EC47D-A253-424B-8695-40257B07B282} = {E3B907A0-538F-47D6-B89A-9701F6D4B382}
+		{4DED17FD-82E0-4566-932A-1371911AD33A} = {E3B907A0-538F-47D6-B89A-9701F6D4B382}
+		{E3B907A0-538F-47D6-B89A-9701F6D4B382} = {2EE736A9-1E7E-4F8D-A584-26E71E13DB86}
+		{6175C4F1-F6F8-49E8-A00C-045858790DBF} = {6F953E17-B84D-41F3-909E-519EB4B1D021}
+		{BC655B2E-62F7-46EC-9A9C-7AEFFEEE53CB} = {6F953E17-B84D-41F3-909E-519EB4B1D021}
+		{6F953E17-B84D-41F3-909E-519EB4B1D021} = {2EE736A9-1E7E-4F8D-A584-26E71E13DB86}
+		{630B7AC3-2028-4423-AB99-8DA96CA33ABA} = {5983845B-0248-40D9-8F36-A76043C7F30B}
+		{5983845B-0248-40D9-8F36-A76043C7F30B} = {2EE736A9-1E7E-4F8D-A584-26E71E13DB86}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EE971A55-D6EB-4648-BA96-BA8BC454EDC5}
diff --git a/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln b/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln
index f1cefd2254f24..7013e98c2c23e 100644
--- a/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln
+++ b/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln
@@ -5,18 +5,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime.Tests", "tests\System.Composition.Runtime.Tests.csproj", "{B19B1509-313D-497D-9636-9A7AD5022DCF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{B4A88209-C940-4B68-A5DE-E553DD2FC8C9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{669F1F31-D3A6-40CD-878C-90FCAE3108F4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1EE96691-E213-40A7-9392-A6A4417AFC4F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{DD9FECB3-A071-4941-9AEC-AD377B0B9B57}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{FEAF43AA-74B0-4152-AB51-8B4BF2D9D4A9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{0A1EE063-9A06-4B23-82E2-C287A28C9A43}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{3F10B47C-BE00-474D-B830-50680DBD627B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{FDD95D90-2DFC-4DA5-8EEA-0F561D0AABDB}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{677DCCA2-C84B-4D33-AFA8-8906764CBAE7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{81E62E76-E824-4685-93D0-9C8C1F5C7AE2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0D8AEC7B-1995-4D2C-90E4-8011BDA3D750}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{1D0C0EB9-4579-46E6-B4F4-593EC762FAA8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{A47C10D6-CEB9-4F90-843F-7D9F611FDDE0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{F4245695-567A-42F5-89F0-2EBBDF5CCD75}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{04063FCA-8F37-46CE-9073-A143131C0CB4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,10 +51,6 @@ Global
 		{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
-		{B4A88209-C940-4B68-A5DE-E553DD2FC8C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4A88209-C940-4B68-A5DE-E553DD2FC8C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B4A88209-C940-4B68-A5DE-E553DD2FC8C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B4A88209-C940-4B68-A5DE-E553DD2FC8C9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{669F1F31-D3A6-40CD-878C-90FCAE3108F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{669F1F31-D3A6-40CD-878C-90FCAE3108F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{669F1F31-D3A6-40CD-878C-90FCAE3108F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -47,6 +59,26 @@ Global
 		{1EE96691-E213-40A7-9392-A6A4417AFC4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1EE96691-E213-40A7-9392-A6A4417AFC4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1EE96691-E213-40A7-9392-A6A4417AFC4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD9FECB3-A071-4941-9AEC-AD377B0B9B57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD9FECB3-A071-4941-9AEC-AD377B0B9B57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD9FECB3-A071-4941-9AEC-AD377B0B9B57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD9FECB3-A071-4941-9AEC-AD377B0B9B57}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FEAF43AA-74B0-4152-AB51-8B4BF2D9D4A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEAF43AA-74B0-4152-AB51-8B4BF2D9D4A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEAF43AA-74B0-4152-AB51-8B4BF2D9D4A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FEAF43AA-74B0-4152-AB51-8B4BF2D9D4A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A1EE063-9A06-4B23-82E2-C287A28C9A43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A1EE063-9A06-4B23-82E2-C287A28C9A43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A1EE063-9A06-4B23-82E2-C287A28C9A43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A1EE063-9A06-4B23-82E2-C287A28C9A43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F10B47C-BE00-474D-B830-50680DBD627B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F10B47C-BE00-474D-B830-50680DBD627B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F10B47C-BE00-474D-B830-50680DBD627B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F10B47C-BE00-474D-B830-50680DBD627B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDD95D90-2DFC-4DA5-8EEA-0F561D0AABDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDD95D90-2DFC-4DA5-8EEA-0F561D0AABDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDD95D90-2DFC-4DA5-8EEA-0F561D0AABDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDD95D90-2DFC-4DA5-8EEA-0F561D0AABDB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -55,9 +87,16 @@ Global
 		{31F52C37-63E5-46F9-A5DE-894E8AC91475} = {677DCCA2-C84B-4D33-AFA8-8906764CBAE7}
 		{B19B1509-313D-497D-9636-9A7AD5022DCF} = {677DCCA2-C84B-4D33-AFA8-8906764CBAE7}
 		{BAC53BBD-B949-419D-833B-54B6A03A1389} = {81E62E76-E824-4685-93D0-9C8C1F5C7AE2}
-		{B4A88209-C940-4B68-A5DE-E553DD2FC8C9} = {0D8AEC7B-1995-4D2C-90E4-8011BDA3D750}
 		{669F1F31-D3A6-40CD-878C-90FCAE3108F4} = {0D8AEC7B-1995-4D2C-90E4-8011BDA3D750}
 		{1EE96691-E213-40A7-9392-A6A4417AFC4F} = {0D8AEC7B-1995-4D2C-90E4-8011BDA3D750}
+		{DD9FECB3-A071-4941-9AEC-AD377B0B9B57} = {1D0C0EB9-4579-46E6-B4F4-593EC762FAA8}
+		{FEAF43AA-74B0-4152-AB51-8B4BF2D9D4A9} = {1D0C0EB9-4579-46E6-B4F4-593EC762FAA8}
+		{1D0C0EB9-4579-46E6-B4F4-593EC762FAA8} = {04063FCA-8F37-46CE-9073-A143131C0CB4}
+		{0A1EE063-9A06-4B23-82E2-C287A28C9A43} = {A47C10D6-CEB9-4F90-843F-7D9F611FDDE0}
+		{3F10B47C-BE00-474D-B830-50680DBD627B} = {A47C10D6-CEB9-4F90-843F-7D9F611FDDE0}
+		{A47C10D6-CEB9-4F90-843F-7D9F611FDDE0} = {04063FCA-8F37-46CE-9073-A143131C0CB4}
+		{FDD95D90-2DFC-4DA5-8EEA-0F561D0AABDB} = {F4245695-567A-42F5-89F0-2EBBDF5CCD75}
+		{F4245695-567A-42F5-89F0-2EBBDF5CCD75} = {04063FCA-8F37-46CE-9073-A143131C0CB4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7686D4EE-C99C-4FC3-AF5C-F06B154E4A54}
diff --git a/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln b/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln
index f78fd27a8e80b..76f8e66da149c 100644
--- a/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln
+++ b/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln
@@ -13,18 +13,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.TypedPar
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{324FA4F8-EA9C-4832-819E-823EF66E0461}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{73B190CC-D704-484D-BC34-F28A6E307D29}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{4FDFF976-E09D-4788-9AE2-BEB9AD129970}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{2DD92A7D-BB66-496A-84A2-6CE277908E45}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{FA77F597-EEA3-464D-B1F7-34D8A34127B4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{3BADB8CD-7AB5-4A0A-9529-30EB5FFE85E6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{EAF1EE23-E0F5-4941-9972-3B6C1E7EF5F6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{C49841FE-18EF-4826-95B1-EE067AA9FC15}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FCCB7E2F-DCC4-402B-BD61-15D0A2831072}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D9ED6745-3C2A-46CB-97DA-C46BA1A3A07B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C335D433-9DCB-40C6-BF0E-556237F94898}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{B3E6363B-21EE-414C-A7F4-A5B8C81C0AEA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{22AD1E6C-67A4-460C-9523-CE06DEC5C129}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{A5412567-6199-48D4-AB30-A8E3929AB999}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{4F8A3637-3E2E-421D-9817-25DA5E49AFD3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -59,10 +75,6 @@ Global
 		{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
-		{324FA4F8-EA9C-4832-819E-823EF66E0461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{324FA4F8-EA9C-4832-819E-823EF66E0461}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{324FA4F8-EA9C-4832-819E-823EF66E0461}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{324FA4F8-EA9C-4832-819E-823EF66E0461}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73B190CC-D704-484D-BC34-F28A6E307D29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73B190CC-D704-484D-BC34-F28A6E307D29}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73B190CC-D704-484D-BC34-F28A6E307D29}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -71,6 +83,26 @@ Global
 		{4FDFF976-E09D-4788-9AE2-BEB9AD129970}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FDFF976-E09D-4788-9AE2-BEB9AD129970}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FDFF976-E09D-4788-9AE2-BEB9AD129970}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DD92A7D-BB66-496A-84A2-6CE277908E45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DD92A7D-BB66-496A-84A2-6CE277908E45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DD92A7D-BB66-496A-84A2-6CE277908E45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DD92A7D-BB66-496A-84A2-6CE277908E45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA77F597-EEA3-464D-B1F7-34D8A34127B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA77F597-EEA3-464D-B1F7-34D8A34127B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA77F597-EEA3-464D-B1F7-34D8A34127B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA77F597-EEA3-464D-B1F7-34D8A34127B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BADB8CD-7AB5-4A0A-9529-30EB5FFE85E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BADB8CD-7AB5-4A0A-9529-30EB5FFE85E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BADB8CD-7AB5-4A0A-9529-30EB5FFE85E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3BADB8CD-7AB5-4A0A-9529-30EB5FFE85E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EAF1EE23-E0F5-4941-9972-3B6C1E7EF5F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAF1EE23-E0F5-4941-9972-3B6C1E7EF5F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAF1EE23-E0F5-4941-9972-3B6C1E7EF5F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EAF1EE23-E0F5-4941-9972-3B6C1E7EF5F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C49841FE-18EF-4826-95B1-EE067AA9FC15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C49841FE-18EF-4826-95B1-EE067AA9FC15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C49841FE-18EF-4826-95B1-EE067AA9FC15}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C49841FE-18EF-4826-95B1-EE067AA9FC15}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -83,9 +115,16 @@ Global
 		{C8B6031E-5DD0-4BE8-9D70-960B24B1D23D} = {D9ED6745-3C2A-46CB-97DA-C46BA1A3A07B}
 		{E5E6C1F3-C318-47FF-B0BC-CFC04BC4AB15} = {D9ED6745-3C2A-46CB-97DA-C46BA1A3A07B}
 		{1B533355-A67E-4912-9605-A08FC7870291} = {D9ED6745-3C2A-46CB-97DA-C46BA1A3A07B}
-		{324FA4F8-EA9C-4832-819E-823EF66E0461} = {C335D433-9DCB-40C6-BF0E-556237F94898}
 		{73B190CC-D704-484D-BC34-F28A6E307D29} = {C335D433-9DCB-40C6-BF0E-556237F94898}
 		{4FDFF976-E09D-4788-9AE2-BEB9AD129970} = {C335D433-9DCB-40C6-BF0E-556237F94898}
+		{2DD92A7D-BB66-496A-84A2-6CE277908E45} = {B3E6363B-21EE-414C-A7F4-A5B8C81C0AEA}
+		{FA77F597-EEA3-464D-B1F7-34D8A34127B4} = {B3E6363B-21EE-414C-A7F4-A5B8C81C0AEA}
+		{B3E6363B-21EE-414C-A7F4-A5B8C81C0AEA} = {4F8A3637-3E2E-421D-9817-25DA5E49AFD3}
+		{3BADB8CD-7AB5-4A0A-9529-30EB5FFE85E6} = {22AD1E6C-67A4-460C-9523-CE06DEC5C129}
+		{EAF1EE23-E0F5-4941-9972-3B6C1E7EF5F6} = {22AD1E6C-67A4-460C-9523-CE06DEC5C129}
+		{22AD1E6C-67A4-460C-9523-CE06DEC5C129} = {4F8A3637-3E2E-421D-9817-25DA5E49AFD3}
+		{C49841FE-18EF-4826-95B1-EE067AA9FC15} = {A5412567-6199-48D4-AB30-A8E3929AB999}
+		{A5412567-6199-48D4-AB30-A8E3929AB999} = {4F8A3637-3E2E-421D-9817-25DA5E49AFD3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {699ABEC3-0D6B-4050-B86A-C6E1317DE039}
diff --git a/src/libraries/System.Composition/System.Composition.sln b/src/libraries/System.Composition/System.Composition.sln
index 380c14c17c29e..db46937271c02 100644
--- a/src/libraries/System.Composition/System.Composition.sln
+++ b/src/libraries/System.Composition/System.Composition.sln
@@ -19,18 +19,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLibrary", "tests\TestLibrary\TestLibrary.csproj", "{B16BCA17-DCA8-43B7-8E8A-89033F7A676E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{8519E429-7116-4A96-BA06-7FCD7C86A05D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{872B3C94-AC4C-4CE3-B8B1-6FDE84C50CE3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{3EA50BD8-ABA5-47D8-AC31-4C6D1C2CAE63}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{F3F80D91-1286-4EC5-B2C1-500A3E8C4807}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{E8567397-C664-455F-BBB1-74DF0BE07570}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{ECE3BD0E-375C-4C17-B902-291A3B163AD7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{AAE2F3DD-3723-4317-9D7E-A7B1461EE757}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{31103FC5-CFD2-48D4-80D0-332DE6AC9840}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E2A40304-1D7F-4BDA-B3A8-150A6B732A82}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A1E6CEE6-45AE-4A8A-A7FA-FFC34DB87C94}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{AB19313E-E606-4F39-AA2E-D3299DC26D7C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{8F4758E9-C437-439D-9151-260D62ACF586}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{E36E5100-ED92-42D2-BF36-97A5613F7E28}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{4BE4613D-4593-4D1D-8FD1-0F1EDFD8ED70}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{28874CB5-7B35-4415-807F-FEAB090DD3AE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -77,10 +93,6 @@ Global
 		{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
-		{8519E429-7116-4A96-BA06-7FCD7C86A05D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8519E429-7116-4A96-BA06-7FCD7C86A05D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8519E429-7116-4A96-BA06-7FCD7C86A05D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8519E429-7116-4A96-BA06-7FCD7C86A05D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{872B3C94-AC4C-4CE3-B8B1-6FDE84C50CE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{872B3C94-AC4C-4CE3-B8B1-6FDE84C50CE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{872B3C94-AC4C-4CE3-B8B1-6FDE84C50CE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -89,6 +101,26 @@ Global
 		{3EA50BD8-ABA5-47D8-AC31-4C6D1C2CAE63}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3EA50BD8-ABA5-47D8-AC31-4C6D1C2CAE63}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3EA50BD8-ABA5-47D8-AC31-4C6D1C2CAE63}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3F80D91-1286-4EC5-B2C1-500A3E8C4807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3F80D91-1286-4EC5-B2C1-500A3E8C4807}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3F80D91-1286-4EC5-B2C1-500A3E8C4807}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3F80D91-1286-4EC5-B2C1-500A3E8C4807}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E8567397-C664-455F-BBB1-74DF0BE07570}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8567397-C664-455F-BBB1-74DF0BE07570}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E8567397-C664-455F-BBB1-74DF0BE07570}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E8567397-C664-455F-BBB1-74DF0BE07570}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECE3BD0E-375C-4C17-B902-291A3B163AD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECE3BD0E-375C-4C17-B902-291A3B163AD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECE3BD0E-375C-4C17-B902-291A3B163AD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECE3BD0E-375C-4C17-B902-291A3B163AD7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AAE2F3DD-3723-4317-9D7E-A7B1461EE757}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAE2F3DD-3723-4317-9D7E-A7B1461EE757}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAE2F3DD-3723-4317-9D7E-A7B1461EE757}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAE2F3DD-3723-4317-9D7E-A7B1461EE757}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31103FC5-CFD2-48D4-80D0-332DE6AC9840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31103FC5-CFD2-48D4-80D0-332DE6AC9840}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31103FC5-CFD2-48D4-80D0-332DE6AC9840}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31103FC5-CFD2-48D4-80D0-332DE6AC9840}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -104,9 +136,16 @@ Global
 		{60940C78-4DDA-4CDD-BA1C-8C9B6DB4FB64} = {A1E6CEE6-45AE-4A8A-A7FA-FFC34DB87C94}
 		{E3295CB6-16E3-497C-A696-71A077DD5828} = {A1E6CEE6-45AE-4A8A-A7FA-FFC34DB87C94}
 		{D1273F2F-1B6C-4EFB-ABF8-6072054E906C} = {A1E6CEE6-45AE-4A8A-A7FA-FFC34DB87C94}
-		{8519E429-7116-4A96-BA06-7FCD7C86A05D} = {AB19313E-E606-4F39-AA2E-D3299DC26D7C}
 		{872B3C94-AC4C-4CE3-B8B1-6FDE84C50CE3} = {AB19313E-E606-4F39-AA2E-D3299DC26D7C}
 		{3EA50BD8-ABA5-47D8-AC31-4C6D1C2CAE63} = {AB19313E-E606-4F39-AA2E-D3299DC26D7C}
+		{F3F80D91-1286-4EC5-B2C1-500A3E8C4807} = {8F4758E9-C437-439D-9151-260D62ACF586}
+		{E8567397-C664-455F-BBB1-74DF0BE07570} = {8F4758E9-C437-439D-9151-260D62ACF586}
+		{8F4758E9-C437-439D-9151-260D62ACF586} = {28874CB5-7B35-4415-807F-FEAB090DD3AE}
+		{ECE3BD0E-375C-4C17-B902-291A3B163AD7} = {E36E5100-ED92-42D2-BF36-97A5613F7E28}
+		{AAE2F3DD-3723-4317-9D7E-A7B1461EE757} = {E36E5100-ED92-42D2-BF36-97A5613F7E28}
+		{E36E5100-ED92-42D2-BF36-97A5613F7E28} = {28874CB5-7B35-4415-807F-FEAB090DD3AE}
+		{31103FC5-CFD2-48D4-80D0-332DE6AC9840} = {4BE4613D-4593-4D1D-8FD1-0F1EDFD8ED70}
+		{4BE4613D-4593-4D1D-8FD1-0F1EDFD8ED70} = {28874CB5-7B35-4415-807F-FEAB090DD3AE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {66F5BC63-E142-4B22-8B5D-1FF5206A7171}
diff --git a/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln b/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
index f4dd87383ebd0..cdac58ca71fee 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
+++ b/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
@@ -1,6 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{2BA69856-B7AB-4113-ABC9-93E3613DF70E}"
+EndProject
 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.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{7228C70B-37CB-4200-A6D4-88724E3EBC76}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "ref\System.Configuration.ConfigurationManager.csproj", "{6F662E39-BB56-4BCF-B053-B4A1782A33E1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "src\System.Configuration.ConfigurationManager.csproj", "{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}"
@@ -13,12 +17,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\src\System.Diagnostics.EventLog.csproj", "{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{D68C6A1A-34DD-49C2-9419-A3297B4C5F07}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{AFE5CE59-CCFC-472D-AE84-143F282335A6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{412BDE9C-0383-4B72-8638-21F6427AA70D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{8D66707F-68BE-47FD-8A83-34A949B6F000}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{A3B59DA6-C08A-4229-91CD-80496DC29389}"
+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}"
@@ -31,105 +43,664 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3393D976-CAF0-47D0-850E-7A44DF892122}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{751DA007-D916-4F22-AF16-85F343C2992C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{BFD32990-050A-4A17-800B-3AFD0A094EB8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{2745CED4-B2D1-4C08-956B-65B2391151BA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{77F11166-9206-4963-B252-6509E34CC33A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{4D98A009-1732-446B-A276-F299ABCA1936}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{7F9B8DF1-8408-48E2-8362-BA5E483A0201}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3393D976-CAF0-47D0-850E-7A44DF892122}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{751DA007-D916-4F22-AF16-85F343C2992C}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BFBE3E0E-4E75-4665-A373-132D283D366D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D6587945-D604-4FCB-B87A-230F32CD9E12}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{6C996BA8-AAE3-4C22-8F34-D585B6C4036D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{EBF0C531-714D-47A5-8901-A8B22A29BB2A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{8F79E1CC-27F6-4DC1-BE12-DC8C46B72401}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm = Debug|arm
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm = Release|arm
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Debug|Any CPU.Build.0 = Debug|x64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Debug|arm.ActiveCfg = Debug|arm
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Debug|arm.Build.0 = Debug|arm
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Debug|arm64.ActiveCfg = Debug|arm64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Debug|arm64.Build.0 = Debug|arm64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Debug|x64.ActiveCfg = Debug|x64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Debug|x64.Build.0 = Debug|x64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Debug|x86.ActiveCfg = Debug|x86
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Debug|x86.Build.0 = Debug|x86
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Release|Any CPU.ActiveCfg = Release|x64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Release|Any CPU.Build.0 = Release|x64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Release|arm.ActiveCfg = Release|arm
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Release|arm.Build.0 = Release|arm
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Release|arm64.ActiveCfg = Release|arm64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Release|arm64.Build.0 = Release|arm64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Release|x64.ActiveCfg = Release|x64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Release|x64.Build.0 = Release|x64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Release|x86.ActiveCfg = Release|x86
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Release|x86.Build.0 = Release|x86
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Checked|Any CPU.Build.0 = Checked|x64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Checked|arm.ActiveCfg = Checked|arm
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Checked|arm.Build.0 = Checked|arm
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Checked|arm64.ActiveCfg = Checked|arm64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Checked|arm64.Build.0 = Checked|arm64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Checked|x64.ActiveCfg = Checked|x64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Checked|x64.Build.0 = Checked|x64
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Checked|x86.ActiveCfg = Checked|x86
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E}.Checked|x86.Build.0 = Checked|x86
 		{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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Debug|x64.Build.0 = Debug|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Debug|x86.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
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Release|arm.ActiveCfg = Release|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Release|arm64.ActiveCfg = Release|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Release|x64.ActiveCfg = Release|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Release|x64.Build.0 = Release|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Release|x86.ActiveCfg = Release|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Release|x86.Build.0 = Release|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Debug|x64.Build.0 = Debug|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Debug|x86.Build.0 = Debug|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Release|arm.ActiveCfg = Release|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Release|x64.ActiveCfg = Release|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Release|x64.Build.0 = Release|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Release|x86.ActiveCfg = Release|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Release|x86.Build.0 = Release|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Debug|x64.Build.0 = Debug|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Debug|x86.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
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Release|arm.ActiveCfg = Release|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Release|x64.ActiveCfg = Release|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Release|x64.Build.0 = Release|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Release|x86.ActiveCfg = Release|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Release|x86.Build.0 = Release|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Debug|x64.Build.0 = Debug|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Debug|x86.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
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Release|arm.ActiveCfg = Release|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Release|x64.ActiveCfg = Release|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Release|x64.Build.0 = Release|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Release|x86.ActiveCfg = Release|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Release|x86.Build.0 = Release|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Debug|x64.Build.0 = Debug|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Debug|x86.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
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Release|arm.ActiveCfg = Release|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Release|x64.ActiveCfg = Release|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Release|x64.Build.0 = Release|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Release|x86.ActiveCfg = Release|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Release|x86.Build.0 = Release|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Debug|x64.Build.0 = Debug|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Debug|x86.Build.0 = Debug|Any CPU
 		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Release|arm.ActiveCfg = Release|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Release|x64.ActiveCfg = Release|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Release|x64.Build.0 = Release|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Release|x86.ActiveCfg = Release|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Release|x86.Build.0 = Release|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Debug|x64.Build.0 = Debug|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Debug|x86.Build.0 = Debug|Any CPU
 		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Release|arm.ActiveCfg = Release|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Release|x64.ActiveCfg = Release|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Release|x64.Build.0 = Release|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Release|x86.ActiveCfg = Release|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Release|x86.Build.0 = Release|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B9C6FFBB-A992-4402-93DC-254C660CF16A}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Debug|x64.Build.0 = Debug|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Debug|x86.Build.0 = Debug|Any CPU
 		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D68C6A1A-34DD-49C2-9419-A3297B4C5F07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D68C6A1A-34DD-49C2-9419-A3297B4C5F07}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D68C6A1A-34DD-49C2-9419-A3297B4C5F07}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D68C6A1A-34DD-49C2-9419-A3297B4C5F07}.Release|Any CPU.Build.0 = Release|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Release|arm.ActiveCfg = Release|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Release|x64.ActiveCfg = Release|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Release|x64.Build.0 = Release|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Release|x86.ActiveCfg = Release|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Release|x86.Build.0 = Release|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Debug|x64.Build.0 = Debug|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Debug|x86.Build.0 = Debug|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Release|arm.ActiveCfg = Release|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Release|x64.ActiveCfg = Release|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Release|x64.Build.0 = Release|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Release|x86.ActiveCfg = Release|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Release|x86.Build.0 = Release|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Debug|x64.Build.0 = Debug|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Debug|x86.Build.0 = Debug|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Release|arm.ActiveCfg = Release|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Release|x64.ActiveCfg = Release|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Release|x64.Build.0 = Release|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Release|x86.ActiveCfg = Release|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Release|x86.Build.0 = Release|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{412BDE9C-0383-4B72-8638-21F6427AA70D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Debug|x64.Build.0 = Debug|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Debug|x86.Build.0 = Debug|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Release|arm.ActiveCfg = Release|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Release|x64.ActiveCfg = Release|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Release|x64.Build.0 = Release|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Release|x86.ActiveCfg = Release|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Release|x86.Build.0 = Release|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8D66707F-68BE-47FD-8A83-34A949B6F000}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Debug|x64.Build.0 = Debug|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Debug|x86.Build.0 = Debug|Any CPU
 		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Release|arm.ActiveCfg = Release|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Release|arm64.ActiveCfg = Release|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Release|x64.ActiveCfg = Release|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Release|x64.Build.0 = Release|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Release|x86.ActiveCfg = Release|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Release|x86.Build.0 = Release|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Debug|x64.Build.0 = Debug|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Debug|x86.Build.0 = Debug|Any CPU
 		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Release|arm.ActiveCfg = Release|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Release|arm64.ActiveCfg = Release|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Release|x64.ActiveCfg = Release|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Release|x64.Build.0 = Release|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Release|x86.ActiveCfg = Release|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Release|x86.Build.0 = Release|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Debug|x64.Build.0 = Debug|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Debug|x86.Build.0 = Debug|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Release|arm.ActiveCfg = Release|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Release|x64.ActiveCfg = Release|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Release|x64.Build.0 = Release|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Release|x86.ActiveCfg = Release|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Release|x86.Build.0 = Release|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Debug|x64.Build.0 = Debug|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Debug|x86.Build.0 = Debug|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Release|arm.ActiveCfg = Release|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Release|x64.ActiveCfg = Release|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Release|x64.Build.0 = Release|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Release|x86.ActiveCfg = Release|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Release|x86.Build.0 = Release|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A3B59DA6-C08A-4229-91CD-80496DC29389}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Debug|x64.Build.0 = Debug|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Debug|x86.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
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Release|arm.ActiveCfg = Release|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Release|x64.ActiveCfg = Release|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Release|x64.Build.0 = Release|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Release|x86.ActiveCfg = Release|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Release|x86.Build.0 = Release|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Debug|x64.Build.0 = Debug|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Debug|x86.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
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Release|arm.ActiveCfg = Release|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Release|x64.ActiveCfg = Release|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Release|x64.Build.0 = Release|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Release|x86.ActiveCfg = Release|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Release|x86.Build.0 = Release|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Debug|x64.Build.0 = Debug|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Debug|x86.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
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Release|arm.ActiveCfg = Release|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Release|x64.ActiveCfg = Release|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Release|x64.Build.0 = Release|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Release|x86.ActiveCfg = Release|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Release|x86.Build.0 = Release|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Debug|x64.Build.0 = Debug|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Debug|x86.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
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Release|arm.ActiveCfg = Release|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Release|x64.ActiveCfg = Release|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Release|x64.Build.0 = Release|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Release|x86.ActiveCfg = Release|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Release|x86.Build.0 = Release|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Debug|x64.Build.0 = Debug|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Debug|x86.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
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Release|arm.ActiveCfg = Release|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Release|arm64.ActiveCfg = Release|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Release|x64.ActiveCfg = Release|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Release|x64.Build.0 = Release|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Release|x86.ActiveCfg = Release|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Release|x86.Build.0 = Release|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Debug|x64.Build.0 = Debug|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Debug|x86.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
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Release|arm.ActiveCfg = Release|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Release|x64.ActiveCfg = Release|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Release|x64.Build.0 = Release|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Release|x86.ActiveCfg = Release|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Release|x86.Build.0 = Release|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Debug|x64.Build.0 = Debug|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Debug|x86.Build.0 = Debug|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Release|arm.ActiveCfg = Release|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Release|x64.ActiveCfg = Release|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Release|x64.Build.0 = Release|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Release|x86.ActiveCfg = Release|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Release|x86.Build.0 = Release|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Debug|x64.Build.0 = Debug|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Debug|x86.Build.0 = Debug|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Release|arm.ActiveCfg = Release|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Release|x64.ActiveCfg = Release|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Release|x64.Build.0 = Release|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Release|x86.ActiveCfg = Release|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Release|x86.Build.0 = Release|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Debug|x64.Build.0 = Debug|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Debug|x86.Build.0 = Debug|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Release|arm.ActiveCfg = Release|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Release|x64.ActiveCfg = Release|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Release|x64.Build.0 = Release|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Release|x86.ActiveCfg = Release|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Release|x86.Build.0 = Release|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2745CED4-B2D1-4C08-956B-65B2391151BA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Debug|x64.Build.0 = Debug|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Debug|x86.Build.0 = Debug|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Release|arm.ActiveCfg = Release|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Release|x64.ActiveCfg = Release|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Release|x64.Build.0 = Release|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Release|x86.ActiveCfg = Release|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Release|x86.Build.0 = Release|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{77F11166-9206-4963-B252-6509E34CC33A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Debug|x64.Build.0 = Debug|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Debug|x86.Build.0 = Debug|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Release|arm.ActiveCfg = Release|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Release|x64.ActiveCfg = Release|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Release|x64.Build.0 = Release|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Release|x86.ActiveCfg = Release|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Release|x86.Build.0 = Release|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4D98A009-1732-446B-A276-F299ABCA1936}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{2BA69856-B7AB-4113-ABC9-93E3613DF70E} = {7F9B8DF1-8408-48E2-8362-BA5E483A0201}
 		{15012FB4-9C7C-4DE0-AB44-83A64654D738} = {3393D976-CAF0-47D0-850E-7A44DF892122}
 		{9476F50F-E44C-4420-96AB-448259A47C4F} = {3393D976-CAF0-47D0-850E-7A44DF892122}
-		{6F662E39-BB56-4BCF-B053-B4A1782A33E1} = {751DA007-D916-4F22-AF16-85F343C2992C}
-		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0} = {751DA007-D916-4F22-AF16-85F343C2992C}
-		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3} = {751DA007-D916-4F22-AF16-85F343C2992C}
-		{CFF7519C-4D41-4713-991D-27777DA2DB21} = {751DA007-D916-4F22-AF16-85F343C2992C}
-		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248} = {751DA007-D916-4F22-AF16-85F343C2992C}
+		{7228C70B-37CB-4200-A6D4-88724E3EBC76} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
 		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
 		{B9C6FFBB-A992-4402-93DC-254C660CF16A} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
 		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
+		{8D66707F-68BE-47FD-8A83-34A949B6F000} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
+		{A3B59DA6-C08A-4229-91CD-80496DC29389} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
 		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
 		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
 		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
-		{D68C6A1A-34DD-49C2-9419-A3297B4C5F07} = {BFBE3E0E-4E75-4665-A373-132D283D366D}
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1} = {751DA007-D916-4F22-AF16-85F343C2992C}
+		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0} = {751DA007-D916-4F22-AF16-85F343C2992C}
+		{412BDE9C-0383-4B72-8638-21F6427AA70D} = {751DA007-D916-4F22-AF16-85F343C2992C}
+		{6659DC55-CF12-45B1-B5CD-1F4F7330BE40} = {751DA007-D916-4F22-AF16-85F343C2992C}
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3} = {751DA007-D916-4F22-AF16-85F343C2992C}
+		{CFF7519C-4D41-4713-991D-27777DA2DB21} = {751DA007-D916-4F22-AF16-85F343C2992C}
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248} = {751DA007-D916-4F22-AF16-85F343C2992C}
+		{AFE5CE59-CCFC-472D-AE84-143F282335A6} = {BFBE3E0E-4E75-4665-A373-132D283D366D}
 		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB} = {BFBE3E0E-4E75-4665-A373-132D283D366D}
 		{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630} = {BFBE3E0E-4E75-4665-A373-132D283D366D}
+		{F9B974AE-C95E-4C9E-8F2F-0FAC091F7FF7} = {D6587945-D604-4FCB-B87A-230F32CD9E12}
+		{BFD32990-050A-4A17-800B-3AFD0A094EB8} = {D6587945-D604-4FCB-B87A-230F32CD9E12}
+		{D6587945-D604-4FCB-B87A-230F32CD9E12} = {8F79E1CC-27F6-4DC1-BE12-DC8C46B72401}
+		{2745CED4-B2D1-4C08-956B-65B2391151BA} = {6C996BA8-AAE3-4C22-8F34-D585B6C4036D}
+		{77F11166-9206-4963-B252-6509E34CC33A} = {6C996BA8-AAE3-4C22-8F34-D585B6C4036D}
+		{6C996BA8-AAE3-4C22-8F34-D585B6C4036D} = {8F79E1CC-27F6-4DC1-BE12-DC8C46B72401}
+		{4D98A009-1732-446B-A276-F299ABCA1936} = {EBF0C531-714D-47A5-8901-A8B22A29BB2A}
+		{EBF0C531-714D-47A5-8901-A8B22A29BB2A} = {8F79E1CC-27F6-4DC1-BE12-DC8C46B72401}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {942CAD8E-C19B-4B9A-BEDE-09B43F45F535}
diff --git a/src/libraries/System.Console/System.Console.sln b/src/libraries/System.Console/System.Console.sln
index c2d9a09717053..4c0eec5b18d85 100644
--- a/src/libraries/System.Console/System.Console.sln
+++ b/src/libraries/System.Console/System.Console.sln
@@ -19,6 +19,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{4DF18F16-0F36-431E-BD64-5F1F0BACA0A6}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{D55C47E2-C4C7-42C8-962D-44CCDC8FDC7B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{BB85AFCB-2A1F-4FDF-81BB-A704523D27FB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{BF601922-9727-4098-BAE8-C0AC1A4163A6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{C3AD4483-61B9-483E-9274-D35E61CF75E2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{07B7BFDE-1EAD-4F43-A61F-A478177359DD}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DF6461C4-C26B-4911-BA9F-E9EBE09BE018}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{87011BFC-F4A7-4BEB-A794-ED75999604BF}"
@@ -27,6 +37,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5F676CAA-AE1
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6A697E68-D9B1-47F4-8AC0-B528E9AA3727}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0EC43FF3-51A9-45DD-8686-744CE1B3FF92}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{F9B59FA0-0C40-4210-8A30-CD99690A2302}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{8C668F04-9180-45A6-B78C-04A6442A083A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{63EC323A-8A6B-4DC8-B6F4-11165A5576C1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -73,6 +91,26 @@ Global
 		{4DF18F16-0F36-431E-BD64-5F1F0BACA0A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4DF18F16-0F36-431E-BD64-5F1F0BACA0A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4DF18F16-0F36-431E-BD64-5F1F0BACA0A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D55C47E2-C4C7-42C8-962D-44CCDC8FDC7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D55C47E2-C4C7-42C8-962D-44CCDC8FDC7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D55C47E2-C4C7-42C8-962D-44CCDC8FDC7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D55C47E2-C4C7-42C8-962D-44CCDC8FDC7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB85AFCB-2A1F-4FDF-81BB-A704523D27FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB85AFCB-2A1F-4FDF-81BB-A704523D27FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB85AFCB-2A1F-4FDF-81BB-A704523D27FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB85AFCB-2A1F-4FDF-81BB-A704523D27FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF601922-9727-4098-BAE8-C0AC1A4163A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF601922-9727-4098-BAE8-C0AC1A4163A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF601922-9727-4098-BAE8-C0AC1A4163A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF601922-9727-4098-BAE8-C0AC1A4163A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3AD4483-61B9-483E-9274-D35E61CF75E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3AD4483-61B9-483E-9274-D35E61CF75E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3AD4483-61B9-483E-9274-D35E61CF75E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3AD4483-61B9-483E-9274-D35E61CF75E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07B7BFDE-1EAD-4F43-A61F-A478177359DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07B7BFDE-1EAD-4F43-A61F-A478177359DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07B7BFDE-1EAD-4F43-A61F-A478177359DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07B7BFDE-1EAD-4F43-A61F-A478177359DD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -88,6 +126,14 @@ Global
 		{EEBFF320-0756-4467-ACAC-F946AA7D7902} = {6A697E68-D9B1-47F4-8AC0-B528E9AA3727}
 		{2B4D1069-DAB2-4A22-96A5-A12DF9B8CA22} = {6A697E68-D9B1-47F4-8AC0-B528E9AA3727}
 		{128A0AF8-9794-49E3-8A07-E518EB9F1402} = {6A697E68-D9B1-47F4-8AC0-B528E9AA3727}
+		{D55C47E2-C4C7-42C8-962D-44CCDC8FDC7B} = {0EC43FF3-51A9-45DD-8686-744CE1B3FF92}
+		{BB85AFCB-2A1F-4FDF-81BB-A704523D27FB} = {0EC43FF3-51A9-45DD-8686-744CE1B3FF92}
+		{0EC43FF3-51A9-45DD-8686-744CE1B3FF92} = {63EC323A-8A6B-4DC8-B6F4-11165A5576C1}
+		{BF601922-9727-4098-BAE8-C0AC1A4163A6} = {F9B59FA0-0C40-4210-8A30-CD99690A2302}
+		{C3AD4483-61B9-483E-9274-D35E61CF75E2} = {F9B59FA0-0C40-4210-8A30-CD99690A2302}
+		{F9B59FA0-0C40-4210-8A30-CD99690A2302} = {63EC323A-8A6B-4DC8-B6F4-11165A5576C1}
+		{07B7BFDE-1EAD-4F43-A61F-A478177359DD} = {8C668F04-9180-45A6-B78C-04A6442A083A}
+		{8C668F04-9180-45A6-B78C-04A6442A083A} = {63EC323A-8A6B-4DC8-B6F4-11165A5576C1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3E14E904-00F2-414A-BCF1-0EB09A861A21}
diff --git a/src/libraries/System.Data.Common/System.Data.Common.sln b/src/libraries/System.Data.Common/System.Data.Common.sln
index 604189e78aa72..15583c0cd0157 100644
--- a/src/libraries/System.Data.Common/System.Data.Common.sln
+++ b/src/libraries/System.Data.Common/System.Data.Common.sln
@@ -57,14 +57,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Transactions.Local",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.ReaderWriter", "..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj", "{521CFFC1-DB45-4FB2-87EF-6BF4F413A011}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5924BF80-8349-4021-A4A3-853FE714A7C7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{CE9436E4-9912-47BA-91D9-D9D371BFEC49}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{83534577-0A40-47CE-872F-E5BC74E10E5B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{A02494B4-8EE6-430D-A99F-7E3DA58C479D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{AEC3AFB1-5825-4C79-89AE-679F510329B8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{83E4FB59-E8AB-41DD-9770-7ACC71364E6A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B1861E5E-4FCA-4CA5-9BB5-5A3C3DBC7F7D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{79588763-C99B-4C1B-88D3-181A92A98364}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5924BF80-8349-4021-A4A3-853FE714A7C7}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{837B27D3-08EF-4E05-AFBF-7E84AEEC1C03}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{E99648EB-D082-44AD-B201-90120D491734}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{2A8F43F6-3C6E-4D25-A26B-4483055B94EF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{5B554CA1-F92F-43B1-9652-712634FD8F07}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -702,18 +722,117 @@ Global
 		{521CFFC1-DB45-4FB2-87EF-6BF4F413A011}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{521CFFC1-DB45-4FB2-87EF-6BF4F413A011}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{521CFFC1-DB45-4FB2-87EF-6BF4F413A011}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Debug|x64.Build.0 = Debug|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Debug|x86.Build.0 = Debug|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Release|arm.ActiveCfg = Release|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Release|x64.ActiveCfg = Release|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Release|x64.Build.0 = Release|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Release|x86.ActiveCfg = Release|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Release|x86.Build.0 = Release|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Debug|x64.Build.0 = Debug|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Debug|x86.Build.0 = Debug|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Release|arm.ActiveCfg = Release|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Release|x64.ActiveCfg = Release|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Release|x64.Build.0 = Release|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Release|x86.ActiveCfg = Release|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Release|x86.Build.0 = Release|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{83534577-0A40-47CE-872F-E5BC74E10E5B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Debug|x64.Build.0 = Debug|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Debug|x86.Build.0 = Debug|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Release|arm.ActiveCfg = Release|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Release|x64.ActiveCfg = Release|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Release|x64.Build.0 = Release|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Release|x86.ActiveCfg = Release|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Release|x86.Build.0 = Release|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Debug|x64.Build.0 = Debug|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Debug|x86.Build.0 = Debug|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Release|arm.ActiveCfg = Release|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Release|x64.ActiveCfg = Release|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Release|x64.Build.0 = Release|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Release|x86.ActiveCfg = Release|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Release|x86.Build.0 = Release|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Debug|x64.Build.0 = Debug|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Debug|x86.Build.0 = Debug|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Release|arm.ActiveCfg = Release|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Release|x64.ActiveCfg = Release|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Release|x64.Build.0 = Release|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Release|x86.ActiveCfg = Release|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Release|x86.Build.0 = Release|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B} = {5924BF80-8349-4021-A4A3-853FE714A7C7}
-		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5} = {5924BF80-8349-4021-A4A3-853FE714A7C7}
-		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313} = {5924BF80-8349-4021-A4A3-853FE714A7C7}
-		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02} = {5924BF80-8349-4021-A4A3-853FE714A7C7}
-		{C3F9A601-07D8-43A3-A3CA-7A002358A102} = {5924BF80-8349-4021-A4A3-853FE714A7C7}
-		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D} = {5924BF80-8349-4021-A4A3-853FE714A7C7}
-		{09129981-6B0D-44C7-9F0A-AD2426106332} = {5924BF80-8349-4021-A4A3-853FE714A7C7}
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B} = {83E4FB59-E8AB-41DD-9770-7ACC71364E6A}
 		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3} = {B1861E5E-4FCA-4CA5-9BB5-5A3C3DBC7F7D}
 		{BEBD7B5B-9544-42EB-B878-F009560CAAF4} = {B1861E5E-4FCA-4CA5-9BB5-5A3C3DBC7F7D}
 		{055E51B6-ACE0-4EE9-97C7-DC37D0FAF5E8} = {79588763-C99B-4C1B-88D3-181A92A98364}
@@ -731,11 +850,25 @@ Global
 		{7E7FA8BC-C1F8-44D3-82BB-82D204B7BEA6} = {79588763-C99B-4C1B-88D3-181A92A98364}
 		{5AD0D9CB-C773-4BBC-87BD-9BDFF172936E} = {79588763-C99B-4C1B-88D3-181A92A98364}
 		{521CFFC1-DB45-4FB2-87EF-6BF4F413A011} = {79588763-C99B-4C1B-88D3-181A92A98364}
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5} = {5924BF80-8349-4021-A4A3-853FE714A7C7}
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313} = {5924BF80-8349-4021-A4A3-853FE714A7C7}
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02} = {5924BF80-8349-4021-A4A3-853FE714A7C7}
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102} = {5924BF80-8349-4021-A4A3-853FE714A7C7}
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D} = {5924BF80-8349-4021-A4A3-853FE714A7C7}
+		{09129981-6B0D-44C7-9F0A-AD2426106332} = {5924BF80-8349-4021-A4A3-853FE714A7C7}
 		{D5A85F0E-509A-424F-BFD0-A7CC38D43CCD} = {D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782}
 		{293AF059-A4CC-43FE-9A5F-E19579B4F7AC} = {D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782}
 		{44DCA516-EEB1-4976-9794-9D6A26A952E9} = {D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782}
 		{D291982D-1FC0-4CA2-A39F-4B490F809F01} = {D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782}
 		{EDDAE59E-8700-49DC-8E46-534037F7F476} = {D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782}
+		{CE9436E4-9912-47BA-91D9-D9D371BFEC49} = {837B27D3-08EF-4E05-AFBF-7E84AEEC1C03}
+		{83534577-0A40-47CE-872F-E5BC74E10E5B} = {837B27D3-08EF-4E05-AFBF-7E84AEEC1C03}
+		{837B27D3-08EF-4E05-AFBF-7E84AEEC1C03} = {5B554CA1-F92F-43B1-9652-712634FD8F07}
+		{893B0928-A209-4F32-A6FC-E7E0AA45BE5A} = {E99648EB-D082-44AD-B201-90120D491734}
+		{A02494B4-8EE6-430D-A99F-7E3DA58C479D} = {E99648EB-D082-44AD-B201-90120D491734}
+		{E99648EB-D082-44AD-B201-90120D491734} = {5B554CA1-F92F-43B1-9652-712634FD8F07}
+		{AEC3AFB1-5825-4C79-89AE-679F510329B8} = {2A8F43F6-3C6E-4D25-A26B-4483055B94EF}
+		{2A8F43F6-3C6E-4D25-A26B-4483055B94EF} = {5B554CA1-F92F-43B1-9652-712634FD8F07}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C1241AC3-6D55-48A6-9502-C46F806889AE}
diff --git a/src/libraries/System.Data.Odbc/System.Data.Odbc.sln b/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
index 5089954290ae7..fc92668a19224 100644
--- a/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
+++ b/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
@@ -19,7 +19,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePa
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Generator", "..\System.Text.RegularExpressions\gen\System.Text.RegularExpressions.Generator.csproj", "{89FD20D3-AF2B-4DAA-8CB3-847E4EA19A5F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{3884A327-F48F-402A-8A7D-53B2040391CB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{DEEDEF15-3088-4AEE-ADBE-9AC13D930C1A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{034324C2-F891-4586-A377-978D2DED76D8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{6F229D06-66BF-4925-AD0D-DFC6A9BE5474}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{13724B8F-069B-4E69-A219-3A35BB9F939B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D561F200-5EE8-46AF-A1B8-537A2A0EFA8F}"
 EndProject
@@ -29,6 +37,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{416AFA87-B3A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{4A564597-B792-466F-A641-DC264A3D6C66}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{A36F3BE8-9F0C-47C0-9670-0F6CDBD32F03}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{C9D86D28-FFBA-419B-BA5E-611AC314EAC0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{81C62506-247F-4C0D-AF97-D51C815C2E5E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{91C6DE13-82B8-4AAB-9215-826256A9BB5D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -75,10 +91,26 @@ Global
 		{BD3A8348-A2AC-468A-B8D9-B639190B0FD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BD3A8348-A2AC-468A-B8D9-B639190B0FD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BD3A8348-A2AC-468A-B8D9-B639190B0FD8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89FD20D3-AF2B-4DAA-8CB3-847E4EA19A5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89FD20D3-AF2B-4DAA-8CB3-847E4EA19A5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89FD20D3-AF2B-4DAA-8CB3-847E4EA19A5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89FD20D3-AF2B-4DAA-8CB3-847E4EA19A5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3884A327-F48F-402A-8A7D-53B2040391CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3884A327-F48F-402A-8A7D-53B2040391CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3884A327-F48F-402A-8A7D-53B2040391CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3884A327-F48F-402A-8A7D-53B2040391CB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DEEDEF15-3088-4AEE-ADBE-9AC13D930C1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEEDEF15-3088-4AEE-ADBE-9AC13D930C1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEEDEF15-3088-4AEE-ADBE-9AC13D930C1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEEDEF15-3088-4AEE-ADBE-9AC13D930C1A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{034324C2-F891-4586-A377-978D2DED76D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{034324C2-F891-4586-A377-978D2DED76D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{034324C2-F891-4586-A377-978D2DED76D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{034324C2-F891-4586-A377-978D2DED76D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F229D06-66BF-4925-AD0D-DFC6A9BE5474}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F229D06-66BF-4925-AD0D-DFC6A9BE5474}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F229D06-66BF-4925-AD0D-DFC6A9BE5474}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F229D06-66BF-4925-AD0D-DFC6A9BE5474}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13724B8F-069B-4E69-A219-3A35BB9F939B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13724B8F-069B-4E69-A219-3A35BB9F939B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13724B8F-069B-4E69-A219-3A35BB9F939B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13724B8F-069B-4E69-A219-3A35BB9F939B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -94,7 +126,14 @@ Global
 		{8DD9B5E3-A86A-4E2D-9CD4-567E358184FE} = {4A564597-B792-466F-A641-DC264A3D6C66}
 		{76183E18-B488-4466-AEE5-3C5D0B3CD917} = {4A564597-B792-466F-A641-DC264A3D6C66}
 		{C41CDCD9-00FB-4A87-893A-9E4788790EE7} = {4A564597-B792-466F-A641-DC264A3D6C66}
-		{89FD20D3-AF2B-4DAA-8CB3-847E4EA19A5F} = {4A564597-B792-466F-A641-DC264A3D6C66}
+		{3884A327-F48F-402A-8A7D-53B2040391CB} = {A36F3BE8-9F0C-47C0-9670-0F6CDBD32F03}
+		{DEEDEF15-3088-4AEE-ADBE-9AC13D930C1A} = {A36F3BE8-9F0C-47C0-9670-0F6CDBD32F03}
+		{A36F3BE8-9F0C-47C0-9670-0F6CDBD32F03} = {91C6DE13-82B8-4AAB-9215-826256A9BB5D}
+		{034324C2-F891-4586-A377-978D2DED76D8} = {C9D86D28-FFBA-419B-BA5E-611AC314EAC0}
+		{6F229D06-66BF-4925-AD0D-DFC6A9BE5474} = {C9D86D28-FFBA-419B-BA5E-611AC314EAC0}
+		{C9D86D28-FFBA-419B-BA5E-611AC314EAC0} = {91C6DE13-82B8-4AAB-9215-826256A9BB5D}
+		{13724B8F-069B-4E69-A219-3A35BB9F939B} = {81C62506-247F-4C0D-AF97-D51C815C2E5E}
+		{81C62506-247F-4C0D-AF97-D51C815C2E5E} = {91C6DE13-82B8-4AAB-9215-826256A9BB5D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D222D648-ABA4-4D02-9230-A2B2CC3F3C39}
diff --git a/src/libraries/System.Data.OleDb/System.Data.Oledb.sln b/src/libraries/System.Data.OleDb/System.Data.Oledb.sln
index 26f56e73559d5..087b3e513523d 100644
--- a/src/libraries/System.Data.OleDb/System.Data.Oledb.sln
+++ b/src/libraries/System.Data.OleDb/System.Data.Oledb.sln
@@ -1,6 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{5DE5039B-D68C-4B66-9F5E-54613FC76423}"
+EndProject
 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.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{ACD7A742-0474-4C95-9769-437A26E7B010}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\ref\System.Configuration.ConfigurationManager.csproj", "{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj", "{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}"
@@ -21,12 +25,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Performa
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{F7FF9B2F-DDFA-4DA9-B765-45C898AF747B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{B749BF37-D346-475F-8C22-13C67A7DA2B6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{67355722-4CF4-40BD-8569-04BA649A0B57}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{B90DD406-44B4-47A9-8BB7-75452A95751F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{40386176-1E3E-41DE-AC3A-9910922BEDFE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{BF351671-8D05-42F5-8218-7676E4356440}"
+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}"
@@ -35,136 +47,756 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{877B4329-854A-412F-B631-6315D77F9C8A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Generator", "..\System.Text.RegularExpressions\gen\System.Text.RegularExpressions.Generator.csproj", "{7AD9D681-F853-47F4-8C1B-A0D1E0440D3B}"
-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", "{BC37CE7C-7BD7-4495-9BC9-810D34DC5B1F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{66C42AC6-739D-45C5-9E37-06B43F285AA7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9AB0B44D-9A64-449F-A0CD-07D39ABEF343}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{F381E5FD-EB66-431A-857F-F66336276DB5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{842D4A99-9C12-45AB-8D0C-D0471E314B93}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{5D47BC07-C66C-4969-AF57-928927B73CCD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{C0F27DD2-DED0-4FA5-8319-64CA1FBCEC31}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BC37CE7C-7BD7-4495-9BC9-810D34DC5B1F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4B964147-AE9C-454F-B971-4F4BD9541280}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9AB0B44D-9A64-449F-A0CD-07D39ABEF343}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{39D097CC-4757-405F-B3C5-17B8050F438C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{C421505B-16CA-4879-B53D-A932AA7083EF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{67A242EB-D6B4-4FB6-88EA-57EEA8258F0A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{0E6D7F5C-08C3-4D23-B0C9-148B9C556BDB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{27F0660E-53DE-4B69-AEEB-E561E0383803}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm = Debug|arm
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm = Release|arm
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Debug|Any CPU.Build.0 = Debug|x64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Debug|arm.ActiveCfg = Debug|arm
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Debug|arm.Build.0 = Debug|arm
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Debug|arm64.ActiveCfg = Debug|arm64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Debug|arm64.Build.0 = Debug|arm64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Debug|x64.ActiveCfg = Debug|x64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Debug|x64.Build.0 = Debug|x64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Debug|x86.ActiveCfg = Debug|x86
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Debug|x86.Build.0 = Debug|x86
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Release|Any CPU.ActiveCfg = Release|x64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Release|Any CPU.Build.0 = Release|x64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Release|arm.ActiveCfg = Release|arm
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Release|arm.Build.0 = Release|arm
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Release|arm64.ActiveCfg = Release|arm64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Release|arm64.Build.0 = Release|arm64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Release|x64.ActiveCfg = Release|x64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Release|x64.Build.0 = Release|x64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Release|x86.ActiveCfg = Release|x86
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Release|x86.Build.0 = Release|x86
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Checked|Any CPU.Build.0 = Checked|x64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Checked|arm.ActiveCfg = Checked|arm
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Checked|arm.Build.0 = Checked|arm
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Checked|arm64.ActiveCfg = Checked|arm64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Checked|arm64.Build.0 = Checked|arm64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Checked|x64.ActiveCfg = Checked|x64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Checked|x64.Build.0 = Checked|x64
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Checked|x86.ActiveCfg = Checked|x86
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423}.Checked|x86.Build.0 = Checked|x86
 		{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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Debug|x64.Build.0 = Debug|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Debug|x86.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
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Release|arm.ActiveCfg = Release|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Release|x64.ActiveCfg = Release|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Release|x64.Build.0 = Release|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Release|x86.ActiveCfg = Release|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Release|x86.Build.0 = Release|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Debug|x64.Build.0 = Debug|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Debug|x86.Build.0 = Debug|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Release|arm.ActiveCfg = Release|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Release|arm64.ActiveCfg = Release|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Release|x64.ActiveCfg = Release|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Release|x64.Build.0 = Release|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Release|x86.ActiveCfg = Release|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Release|x86.Build.0 = Release|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{ACD7A742-0474-4C95-9769-437A26E7B010}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Debug|x64.Build.0 = Debug|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Debug|x86.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
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Release|arm.ActiveCfg = Release|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Release|x64.ActiveCfg = Release|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Release|x64.Build.0 = Release|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Release|x86.ActiveCfg = Release|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Release|x86.Build.0 = Release|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Debug|x64.Build.0 = Debug|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Debug|x86.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
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Release|arm.ActiveCfg = Release|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Release|arm64.ActiveCfg = Release|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Release|x64.ActiveCfg = Release|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Release|x64.Build.0 = Release|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Release|x86.ActiveCfg = Release|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Release|x86.Build.0 = Release|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Debug|x64.Build.0 = Debug|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Debug|x86.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
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Release|arm.ActiveCfg = Release|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Release|arm64.ActiveCfg = Release|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Release|x64.ActiveCfg = Release|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Release|x64.Build.0 = Release|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Release|x86.ActiveCfg = Release|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Release|x86.Build.0 = Release|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Debug|x64.Build.0 = Debug|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Debug|x86.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
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Release|arm.ActiveCfg = Release|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Release|x64.ActiveCfg = Release|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Release|x64.Build.0 = Release|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Release|x86.ActiveCfg = Release|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Release|x86.Build.0 = Release|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Debug|x64.Build.0 = Debug|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Debug|x86.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
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Release|arm.ActiveCfg = Release|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Release|x64.ActiveCfg = Release|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Release|x64.Build.0 = Release|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Release|x86.ActiveCfg = Release|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Release|x86.Build.0 = Release|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{F7379254-05CC-4F91-B230-4DD992502C75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F7379254-05CC-4F91-B230-4DD992502C75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Debug|x64.Build.0 = Debug|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Debug|x86.Build.0 = Debug|Any CPU
 		{F7379254-05CC-4F91-B230-4DD992502C75}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F7379254-05CC-4F91-B230-4DD992502C75}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Release|arm.ActiveCfg = Release|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Release|x64.ActiveCfg = Release|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Release|x64.Build.0 = Release|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Release|x86.ActiveCfg = Release|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Release|x86.Build.0 = Release|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F7379254-05CC-4F91-B230-4DD992502C75}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Debug|x64.Build.0 = Debug|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Debug|x86.Build.0 = Debug|Any CPU
 		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Release|arm.ActiveCfg = Release|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Release|x64.ActiveCfg = Release|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Release|x64.Build.0 = Release|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Release|x86.ActiveCfg = Release|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Release|x86.Build.0 = Release|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CE5ACEBD-8B25-4523-842C-1BF961044C17}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Debug|x64.Build.0 = Debug|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Debug|x86.Build.0 = Debug|Any CPU
 		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Release|arm.ActiveCfg = Release|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Release|arm64.ActiveCfg = Release|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Release|x64.ActiveCfg = Release|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Release|x64.Build.0 = Release|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Release|x86.ActiveCfg = Release|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Release|x86.Build.0 = Release|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Debug|x64.Build.0 = Debug|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Debug|x86.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
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Release|arm.ActiveCfg = Release|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Release|x64.ActiveCfg = Release|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Release|x64.Build.0 = Release|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Release|x86.ActiveCfg = Release|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Release|x86.Build.0 = Release|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Debug|x64.Build.0 = Debug|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Debug|x86.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
-		{F7FF9B2F-DDFA-4DA9-B765-45C898AF747B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F7FF9B2F-DDFA-4DA9-B765-45C898AF747B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7FF9B2F-DDFA-4DA9-B765-45C898AF747B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F7FF9B2F-DDFA-4DA9-B765-45C898AF747B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Release|arm.ActiveCfg = Release|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Release|x64.ActiveCfg = Release|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Release|x64.Build.0 = Release|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Release|x86.ActiveCfg = Release|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Release|x86.Build.0 = Release|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Debug|x64.Build.0 = Debug|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Debug|x86.Build.0 = Debug|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Release|arm.ActiveCfg = Release|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Release|x64.ActiveCfg = Release|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Release|x64.Build.0 = Release|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Release|x86.ActiveCfg = Release|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Release|x86.Build.0 = Release|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Debug|x64.Build.0 = Debug|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Debug|x86.Build.0 = Debug|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Release|arm.ActiveCfg = Release|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Release|arm64.ActiveCfg = Release|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Release|x64.ActiveCfg = Release|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Release|x64.Build.0 = Release|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Release|x86.ActiveCfg = Release|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Release|x86.Build.0 = Release|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{67355722-4CF4-40BD-8569-04BA649A0B57}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Debug|x64.Build.0 = Debug|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Debug|x86.Build.0 = Debug|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Release|arm.ActiveCfg = Release|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Release|x64.ActiveCfg = Release|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Release|x64.Build.0 = Release|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Release|x86.ActiveCfg = Release|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Release|x86.Build.0 = Release|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B90DD406-44B4-47A9-8BB7-75452A95751F}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Debug|x64.Build.0 = Debug|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Debug|x86.Build.0 = Debug|Any CPU
 		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Release|arm.ActiveCfg = Release|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Release|x64.ActiveCfg = Release|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Release|x64.Build.0 = Release|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Release|x86.ActiveCfg = Release|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Release|x86.Build.0 = Release|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Debug|x64.Build.0 = Debug|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Debug|x86.Build.0 = Debug|Any CPU
 		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Release|arm.ActiveCfg = Release|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Release|x64.ActiveCfg = Release|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Release|x64.Build.0 = Release|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Release|x86.ActiveCfg = Release|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Release|x86.Build.0 = Release|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Debug|x64.Build.0 = Debug|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Debug|x86.Build.0 = Debug|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Release|arm.ActiveCfg = Release|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Release|x64.ActiveCfg = Release|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Release|x64.Build.0 = Release|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Release|x86.ActiveCfg = Release|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Release|x86.Build.0 = Release|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Debug|x64.Build.0 = Debug|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Debug|x86.Build.0 = Debug|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Release|arm.ActiveCfg = Release|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Release|arm64.ActiveCfg = Release|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Release|x64.ActiveCfg = Release|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Release|x64.Build.0 = Release|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Release|x86.ActiveCfg = Release|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Release|x86.Build.0 = Release|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BF351671-8D05-42F5-8218-7676E4356440}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Debug|x64.Build.0 = Debug|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Debug|x86.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
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Release|arm.ActiveCfg = Release|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Release|arm64.ActiveCfg = Release|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Release|x64.ActiveCfg = Release|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Release|x64.Build.0 = Release|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Release|x86.ActiveCfg = Release|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Release|x86.Build.0 = Release|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Debug|x64.Build.0 = Debug|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Debug|x86.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
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Release|arm.ActiveCfg = Release|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Release|arm64.ActiveCfg = Release|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Release|x64.ActiveCfg = Release|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Release|x64.Build.0 = Release|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Release|x86.ActiveCfg = Release|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Release|x86.Build.0 = Release|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Debug|x64.Build.0 = Debug|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Debug|x86.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
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Release|arm.ActiveCfg = Release|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Release|x64.ActiveCfg = Release|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Release|x64.Build.0 = Release|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Release|x86.ActiveCfg = Release|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Release|x86.Build.0 = Release|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Debug|x64.Build.0 = Debug|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Debug|x86.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
-		{7AD9D681-F853-47F4-8C1B-A0D1E0440D3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7AD9D681-F853-47F4-8C1B-A0D1E0440D3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AD9D681-F853-47F4-8C1B-A0D1E0440D3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7AD9D681-F853-47F4-8C1B-A0D1E0440D3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Release|arm.ActiveCfg = Release|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Release|x64.ActiveCfg = Release|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Release|x64.Build.0 = Release|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Release|x86.ActiveCfg = Release|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Release|x86.Build.0 = Release|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Debug|x64.Build.0 = Debug|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Debug|x86.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
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Release|arm.ActiveCfg = Release|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Release|x64.ActiveCfg = Release|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Release|x64.Build.0 = Release|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Release|x86.ActiveCfg = Release|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Release|x86.Build.0 = Release|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Debug|x64.Build.0 = Debug|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Debug|x86.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
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Release|arm.ActiveCfg = Release|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Release|x64.ActiveCfg = Release|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Release|x64.Build.0 = Release|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Release|x86.ActiveCfg = Release|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Release|x86.Build.0 = Release|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Debug|x64.Build.0 = Debug|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Debug|x86.Build.0 = Debug|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Release|arm.ActiveCfg = Release|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Release|arm64.ActiveCfg = Release|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Release|x64.ActiveCfg = Release|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Release|x64.Build.0 = Release|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Release|x86.ActiveCfg = Release|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Release|x86.Build.0 = Release|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Debug|x64.Build.0 = Debug|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Debug|x86.Build.0 = Debug|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Release|arm.ActiveCfg = Release|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Release|x64.ActiveCfg = Release|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Release|x64.Build.0 = Release|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Release|x86.ActiveCfg = Release|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Release|x86.Build.0 = Release|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F381E5FD-EB66-431A-857F-F66336276DB5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Debug|x64.Build.0 = Debug|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Debug|x86.Build.0 = Debug|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Release|arm.ActiveCfg = Release|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Release|arm64.ActiveCfg = Release|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Release|x64.ActiveCfg = Release|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Release|x64.Build.0 = Release|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Release|x86.ActiveCfg = Release|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Release|x86.Build.0 = Release|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Debug|x64.Build.0 = Debug|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Debug|x86.Build.0 = Debug|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Release|arm.ActiveCfg = Release|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Release|arm64.ActiveCfg = Release|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Release|x64.ActiveCfg = Release|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Release|x64.Build.0 = Release|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Release|x86.ActiveCfg = Release|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Release|x86.Build.0 = Release|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5D47BC07-C66C-4969-AF57-928927B73CCD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Debug|x64.Build.0 = Debug|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Debug|x86.Build.0 = Debug|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Release|arm.ActiveCfg = Release|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Release|x64.ActiveCfg = Release|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Release|x64.Build.0 = Release|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Release|x86.ActiveCfg = Release|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Release|x86.Build.0 = Release|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{5DE5039B-D68C-4B66-9F5E-54613FC76423} = {C0F27DD2-DED0-4FA5-8319-64CA1FBCEC31}
 		{30142600-D924-4FDC-9A98-D621C3A2CCEA} = {BC37CE7C-7BD7-4495-9BC9-810D34DC5B1F}
 		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A} = {BC37CE7C-7BD7-4495-9BC9-810D34DC5B1F}
-		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
-		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
-		{F7379254-05CC-4F91-B230-4DD992502C75} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
-		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
-		{EF8D1526-9463-401B-9EAE-D4B98C86E046} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
-		{C73C11A5-863A-440D-B568-00CA5E7C9DA0} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
-		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
+		{ACD7A742-0474-4C95-9769-437A26E7B010} = {4B964147-AE9C-454F-B971-4F4BD9541280}
 		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45} = {4B964147-AE9C-454F-B971-4F4BD9541280}
 		{9C557B87-DEE3-4B28-A82D-796418B3F608} = {4B964147-AE9C-454F-B971-4F4BD9541280}
 		{CE5ACEBD-8B25-4523-842C-1BF961044C17} = {4B964147-AE9C-454F-B971-4F4BD9541280}
 		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7} = {4B964147-AE9C-454F-B971-4F4BD9541280}
 		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1} = {4B964147-AE9C-454F-B971-4F4BD9541280}
+		{B90DD406-44B4-47A9-8BB7-75452A95751F} = {4B964147-AE9C-454F-B971-4F4BD9541280}
+		{BF351671-8D05-42F5-8218-7676E4356440} = {4B964147-AE9C-454F-B971-4F4BD9541280}
 		{15628477-9D25-41FA-81B0-59D43D1363F4} = {4B964147-AE9C-454F-B971-4F4BD9541280}
 		{877B4329-854A-412F-B631-6315D77F9C8A} = {4B964147-AE9C-454F-B971-4F4BD9541280}
 		{A3AC9584-763B-4686-B6D8-49140FC62EC4} = {4B964147-AE9C-454F-B971-4F4BD9541280}
-		{F7FF9B2F-DDFA-4DA9-B765-45C898AF747B} = {39D097CC-4757-405F-B3C5-17B8050F438C}
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
+		{F7379254-05CC-4F91-B230-4DD992502C75} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
+		{67355722-4CF4-40BD-8569-04BA649A0B57} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
+		{40386176-1E3E-41DE-AC3A-9910922BEDFE} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
+		{B749BF37-D346-475F-8C22-13C67A7DA2B6} = {39D097CC-4757-405F-B3C5-17B8050F438C}
 		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63} = {39D097CC-4757-405F-B3C5-17B8050F438C}
 		{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97} = {39D097CC-4757-405F-B3C5-17B8050F438C}
-		{7AD9D681-F853-47F4-8C1B-A0D1E0440D3B} = {39D097CC-4757-405F-B3C5-17B8050F438C}
+		{66C42AC6-739D-45C5-9E37-06B43F285AA7} = {C421505B-16CA-4879-B53D-A932AA7083EF}
+		{F381E5FD-EB66-431A-857F-F66336276DB5} = {C421505B-16CA-4879-B53D-A932AA7083EF}
+		{C421505B-16CA-4879-B53D-A932AA7083EF} = {27F0660E-53DE-4B69-AEEB-E561E0383803}
+		{842D4A99-9C12-45AB-8D0C-D0471E314B93} = {67A242EB-D6B4-4FB6-88EA-57EEA8258F0A}
+		{5D47BC07-C66C-4969-AF57-928927B73CCD} = {67A242EB-D6B4-4FB6-88EA-57EEA8258F0A}
+		{67A242EB-D6B4-4FB6-88EA-57EEA8258F0A} = {27F0660E-53DE-4B69-AEEB-E561E0383803}
+		{F090E986-15B1-4C2C-94DF-ADE84C8A8D62} = {0E6D7F5C-08C3-4D23-B0C9-148B9C556BDB}
+		{0E6D7F5C-08C3-4D23-B0C9-148B9C556BDB} = {27F0660E-53DE-4B69-AEEB-E561E0383803}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4895E2D2-31A2-4EB8-9C53-04C408F62DC4}
diff --git a/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln b/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
index 4c5b86509b668..aeac1fd484e03 100644
--- a/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
+++ b/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
@@ -19,14 +19,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{CA4E8737-E42F-4524-A1A0-D2673B7B7AAF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ABC2D63C-77D2-49D8-AF86-2530D6672269}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{2230688E-229F-4044-9C82-79988F03047E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{70D6977F-5BEA-4E17-BF41-474898185963}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{96A360E6-0155-498C-8F58-9C40E791AA64}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{9132E794-A863-4073-86A2-3A6FA9B6C6CD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{5F95C6BC-43E8-4E5D-93AC-80500F798AEF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{56A31E71-2D11-484D-A9D0-97E4A2AD9354}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8B71FA04-1D67-4607-94A4-E2A85977B1FA}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ABC2D63C-77D2-49D8-AF86-2530D6672269}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{24204C7B-8FCC-4D46-8E72-BB7128DB5572}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0FD77A15-66A8-4E7D-BE30-4976EB1A74B9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{87246B81-BD3B-45C9-B741-F37005120BDB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{AD616F7D-C70A-403C-80BF-6167C38F0625}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{72C674BC-3D45-4823-98C6-4B55EC85BAEE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -265,21 +285,134 @@ Global
 		{CA4E8737-E42F-4524-A1A0-D2673B7B7AAF}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{CA4E8737-E42F-4524-A1A0-D2673B7B7AAF}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{CA4E8737-E42F-4524-A1A0-D2673B7B7AAF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Debug|x64.Build.0 = Debug|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Debug|x86.Build.0 = Debug|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Release|arm.ActiveCfg = Release|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Release|x64.ActiveCfg = Release|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Release|x64.Build.0 = Release|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Release|x86.ActiveCfg = Release|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Release|x86.Build.0 = Release|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2230688E-229F-4044-9C82-79988F03047E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Debug|x64.Build.0 = Debug|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Debug|x86.Build.0 = Debug|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Release|arm.ActiveCfg = Release|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Release|arm64.ActiveCfg = Release|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Release|x64.ActiveCfg = Release|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Release|x64.Build.0 = Release|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Release|x86.ActiveCfg = Release|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Release|x86.Build.0 = Release|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{70D6977F-5BEA-4E17-BF41-474898185963}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Debug|x64.Build.0 = Debug|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Debug|x86.Build.0 = Debug|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Release|arm.ActiveCfg = Release|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Release|arm64.ActiveCfg = Release|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Release|x64.ActiveCfg = Release|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Release|x64.Build.0 = Release|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Release|x86.ActiveCfg = Release|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Release|x86.Build.0 = Release|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{96A360E6-0155-498C-8F58-9C40E791AA64}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Debug|x64.Build.0 = Debug|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Debug|x86.Build.0 = Debug|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Release|arm.ActiveCfg = Release|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Release|arm64.ActiveCfg = Release|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Release|x64.ActiveCfg = Release|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Release|x64.Build.0 = Release|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Release|x86.ActiveCfg = Release|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Release|x86.Build.0 = Release|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Debug|x64.Build.0 = Debug|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Debug|x86.Build.0 = Debug|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Release|arm.ActiveCfg = Release|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Release|x64.ActiveCfg = Release|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Release|x64.Build.0 = Release|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Release|x86.ActiveCfg = Release|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Release|x86.Build.0 = Release|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D5A81248-C2F8-464A-8EA4-2AB2528206BC} = {ABC2D63C-77D2-49D8-AF86-2530D6672269}
-		{158DD2BA-5789-49B8-A801-77EF5D4FD324} = {ABC2D63C-77D2-49D8-AF86-2530D6672269}
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC} = {5F95C6BC-43E8-4E5D-93AC-80500F798AEF}
 		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE} = {56A31E71-2D11-484D-A9D0-97E4A2AD9354}
 		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50} = {56A31E71-2D11-484D-A9D0-97E4A2AD9354}
 		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0} = {8B71FA04-1D67-4607-94A4-E2A85977B1FA}
 		{B0B27299-653F-4B2C-A69B-81056AC2FE46} = {8B71FA04-1D67-4607-94A4-E2A85977B1FA}
 		{CA4E8737-E42F-4524-A1A0-D2673B7B7AAF} = {8B71FA04-1D67-4607-94A4-E2A85977B1FA}
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324} = {ABC2D63C-77D2-49D8-AF86-2530D6672269}
 		{452B9C44-BE4A-4D0E-9412-07280582D3BB} = {24204C7B-8FCC-4D46-8E72-BB7128DB5572}
 		{B1366F4C-E5CC-4AF3-A67F-C28216E570B3} = {24204C7B-8FCC-4D46-8E72-BB7128DB5572}
 		{9C3EAF3C-A96C-4D5F-95FE-BBCB1580DECA} = {24204C7B-8FCC-4D46-8E72-BB7128DB5572}
+		{2230688E-229F-4044-9C82-79988F03047E} = {0FD77A15-66A8-4E7D-BE30-4976EB1A74B9}
+		{70D6977F-5BEA-4E17-BF41-474898185963} = {0FD77A15-66A8-4E7D-BE30-4976EB1A74B9}
+		{0FD77A15-66A8-4E7D-BE30-4976EB1A74B9} = {72C674BC-3D45-4823-98C6-4B55EC85BAEE}
+		{96A360E6-0155-498C-8F58-9C40E791AA64} = {87246B81-BD3B-45C9-B741-F37005120BDB}
+		{5565BB1F-2B65-4B5A-AE4A-4BED5CB31AEB} = {87246B81-BD3B-45C9-B741-F37005120BDB}
+		{87246B81-BD3B-45C9-B741-F37005120BDB} = {72C674BC-3D45-4823-98C6-4B55EC85BAEE}
+		{9132E794-A863-4073-86A2-3A6FA9B6C6CD} = {AD616F7D-C70A-403C-80BF-6167C38F0625}
+		{AD616F7D-C70A-403C-80BF-6167C38F0625} = {72C674BC-3D45-4823-98C6-4B55EC85BAEE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D03A9093-136B-4C69-AFC1-106658815511}
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln b/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
index 2d4a51c7910af..f89f842787fd3 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
@@ -17,6 +17,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{ADF92A08-5F09-4726-9211-F348E2DFA18F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{490375CF-2958-45D6-BC5D-5F7D9FE03127}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{882FBA8E-CF81-4D2A-BE24-8325F8B358AA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{511C0EB3-2449-487D-9FB7-9D810F7F98F6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{EE788116-F0E1-4775-AC66-6B65213053E0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{0E845CB0-A0F3-4CD2-A82A-02FA3A7C9A81}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5ACE392F-5FD1-4A91-B992-2D7562BEACDE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4667237A-8A15-43B3-8CDF-2D0E9B212182}"
@@ -25,6 +35,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{995CF17B-85C
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E2336D66-4276-48F1-9619-1F79CE7140EC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{BCC999D8-B42C-41F8-899D-B804886E4C03}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{44D96A42-4F6C-4631-8CB8-BF72A64C97EA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{264B17CB-0CAA-43F0-BF9F-9E1662F16903}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{29727812-660B-4E27-8053-341C025B643C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,6 +85,26 @@ Global
 		{ADF92A08-5F09-4726-9211-F348E2DFA18F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ADF92A08-5F09-4726-9211-F348E2DFA18F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADF92A08-5F09-4726-9211-F348E2DFA18F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{490375CF-2958-45D6-BC5D-5F7D9FE03127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{490375CF-2958-45D6-BC5D-5F7D9FE03127}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{490375CF-2958-45D6-BC5D-5F7D9FE03127}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{490375CF-2958-45D6-BC5D-5F7D9FE03127}.Release|Any CPU.Build.0 = Release|Any CPU
+		{882FBA8E-CF81-4D2A-BE24-8325F8B358AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{882FBA8E-CF81-4D2A-BE24-8325F8B358AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{882FBA8E-CF81-4D2A-BE24-8325F8B358AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{882FBA8E-CF81-4D2A-BE24-8325F8B358AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{511C0EB3-2449-487D-9FB7-9D810F7F98F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{511C0EB3-2449-487D-9FB7-9D810F7F98F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{511C0EB3-2449-487D-9FB7-9D810F7F98F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{511C0EB3-2449-487D-9FB7-9D810F7F98F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE788116-F0E1-4775-AC66-6B65213053E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE788116-F0E1-4775-AC66-6B65213053E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE788116-F0E1-4775-AC66-6B65213053E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE788116-F0E1-4775-AC66-6B65213053E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E845CB0-A0F3-4CD2-A82A-02FA3A7C9A81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E845CB0-A0F3-4CD2-A82A-02FA3A7C9A81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E845CB0-A0F3-4CD2-A82A-02FA3A7C9A81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E845CB0-A0F3-4CD2-A82A-02FA3A7C9A81}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -81,6 +119,14 @@ Global
 		{19AD004A-4F95-43BF-B1A4-5D9CE185EDCC} = {E2336D66-4276-48F1-9619-1F79CE7140EC}
 		{C43479BA-BAF7-4F1D-B9AF-418869CF9143} = {E2336D66-4276-48F1-9619-1F79CE7140EC}
 		{F97FBDC1-22F3-4745-B934-2E2A650EDA6A} = {E2336D66-4276-48F1-9619-1F79CE7140EC}
+		{490375CF-2958-45D6-BC5D-5F7D9FE03127} = {BCC999D8-B42C-41F8-899D-B804886E4C03}
+		{882FBA8E-CF81-4D2A-BE24-8325F8B358AA} = {BCC999D8-B42C-41F8-899D-B804886E4C03}
+		{BCC999D8-B42C-41F8-899D-B804886E4C03} = {29727812-660B-4E27-8053-341C025B643C}
+		{511C0EB3-2449-487D-9FB7-9D810F7F98F6} = {44D96A42-4F6C-4631-8CB8-BF72A64C97EA}
+		{EE788116-F0E1-4775-AC66-6B65213053E0} = {44D96A42-4F6C-4631-8CB8-BF72A64C97EA}
+		{44D96A42-4F6C-4631-8CB8-BF72A64C97EA} = {29727812-660B-4E27-8053-341C025B643C}
+		{0E845CB0-A0F3-4CD2-A82A-02FA3A7C9A81} = {264B17CB-0CAA-43F0-BF9F-9E1662F16903}
+		{264B17CB-0CAA-43F0-BF9F-9E1662F16903} = {29727812-660B-4E27-8053-341C025B643C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6C0E44F7-3944-4BCA-94DA-2E558CEA1FE8}
diff --git a/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln b/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln
index 5f90558440e60..c59acbb401865 100644
--- a/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln
+++ b/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln
@@ -9,12 +9,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog.Tests", "tests\System.Diagnostics.EventLog.Tests.csproj", "{DE282697-BDF2-4FC7-B34C-911F35AE47D6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{21DD40E5-CB83-4946-AD7D-04816A087CF0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{C470A83B-8C8C-4C87-9A3F-31B2E0070A13}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D49EF33F-919D-4DE5-B4B1-CF6697EF3806}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{545F883A-09C0-4390-A199-09F8C2357926}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{428AA723-E444-4F5A-B7D5-7C8AB0EF6D40}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{BF39A676-D8BB-4340-9EBC-CDC5C1C512C8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{E8645748-FEE1-4FC7-8036-DBC069FFADDD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{ACB7C6A9-90A4-42B2-B304-8F11E973D88E}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1E261D15-54E1-424E-BE7F-400B01EFE870}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FFB9A9A0-BCDB-42B1-9D58-E25AC8B95C4C}"
@@ -23,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DBD1571C-058
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{1096CED3-1AA7-4FA5-BF1A-EEFD977B6D3B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{B18C3D31-F222-4259-A29E-0803ED18C3A1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{F6FD11BE-189A-4E7D-99D2-D241EB9B5883}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{8ECCB312-5CC4-4324-9850-3F9AC44B6960}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{17C71A4D-2C4A-42AA-8880-3AFBE513A6E1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -49,10 +65,6 @@ Global
 		{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
-		{21DD40E5-CB83-4946-AD7D-04816A087CF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21DD40E5-CB83-4946-AD7D-04816A087CF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21DD40E5-CB83-4946-AD7D-04816A087CF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21DD40E5-CB83-4946-AD7D-04816A087CF0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C470A83B-8C8C-4C87-9A3F-31B2E0070A13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C470A83B-8C8C-4C87-9A3F-31B2E0070A13}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C470A83B-8C8C-4C87-9A3F-31B2E0070A13}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,6 +73,26 @@ Global
 		{D49EF33F-919D-4DE5-B4B1-CF6697EF3806}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D49EF33F-919D-4DE5-B4B1-CF6697EF3806}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D49EF33F-919D-4DE5-B4B1-CF6697EF3806}.Release|Any CPU.Build.0 = Release|Any CPU
+		{545F883A-09C0-4390-A199-09F8C2357926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{545F883A-09C0-4390-A199-09F8C2357926}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{545F883A-09C0-4390-A199-09F8C2357926}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{545F883A-09C0-4390-A199-09F8C2357926}.Release|Any CPU.Build.0 = Release|Any CPU
+		{428AA723-E444-4F5A-B7D5-7C8AB0EF6D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{428AA723-E444-4F5A-B7D5-7C8AB0EF6D40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{428AA723-E444-4F5A-B7D5-7C8AB0EF6D40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{428AA723-E444-4F5A-B7D5-7C8AB0EF6D40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF39A676-D8BB-4340-9EBC-CDC5C1C512C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF39A676-D8BB-4340-9EBC-CDC5C1C512C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF39A676-D8BB-4340-9EBC-CDC5C1C512C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF39A676-D8BB-4340-9EBC-CDC5C1C512C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E8645748-FEE1-4FC7-8036-DBC069FFADDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8645748-FEE1-4FC7-8036-DBC069FFADDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E8645748-FEE1-4FC7-8036-DBC069FFADDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E8645748-FEE1-4FC7-8036-DBC069FFADDD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ACB7C6A9-90A4-42B2-B304-8F11E973D88E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACB7C6A9-90A4-42B2-B304-8F11E973D88E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ACB7C6A9-90A4-42B2-B304-8F11E973D88E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ACB7C6A9-90A4-42B2-B304-8F11E973D88E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -71,9 +103,16 @@ Global
 		{635F5794-A69E-489D-9D1F-1D20D3DDE740} = {FFB9A9A0-BCDB-42B1-9D58-E25AC8B95C4C}
 		{A5B6EFFE-E24B-4DC8-B0FA-68ADCE59B74C} = {DBD1571C-0586-470C-83A4-84A174680603}
 		{5BB72C32-4B04-415E-A504-F41F2FE0E54D} = {DBD1571C-0586-470C-83A4-84A174680603}
-		{21DD40E5-CB83-4946-AD7D-04816A087CF0} = {1096CED3-1AA7-4FA5-BF1A-EEFD977B6D3B}
 		{C470A83B-8C8C-4C87-9A3F-31B2E0070A13} = {1096CED3-1AA7-4FA5-BF1A-EEFD977B6D3B}
 		{D49EF33F-919D-4DE5-B4B1-CF6697EF3806} = {1096CED3-1AA7-4FA5-BF1A-EEFD977B6D3B}
+		{545F883A-09C0-4390-A199-09F8C2357926} = {B18C3D31-F222-4259-A29E-0803ED18C3A1}
+		{428AA723-E444-4F5A-B7D5-7C8AB0EF6D40} = {B18C3D31-F222-4259-A29E-0803ED18C3A1}
+		{B18C3D31-F222-4259-A29E-0803ED18C3A1} = {17C71A4D-2C4A-42AA-8880-3AFBE513A6E1}
+		{BF39A676-D8BB-4340-9EBC-CDC5C1C512C8} = {F6FD11BE-189A-4E7D-99D2-D241EB9B5883}
+		{E8645748-FEE1-4FC7-8036-DBC069FFADDD} = {F6FD11BE-189A-4E7D-99D2-D241EB9B5883}
+		{F6FD11BE-189A-4E7D-99D2-D241EB9B5883} = {17C71A4D-2C4A-42AA-8880-3AFBE513A6E1}
+		{ACB7C6A9-90A4-42B2-B304-8F11E973D88E} = {8ECCB312-5CC4-4324-9850-3F9AC44B6960}
+		{8ECCB312-5CC4-4324-9850-3F9AC44B6960} = {17C71A4D-2C4A-42AA-8880-3AFBE513A6E1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3DB51F1D-40A4-4B5E-85BF-74CCDEE2FAA7}
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln b/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
index 0c4eb45edbe95..261723cd52233 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
@@ -17,6 +17,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{25C578E4-95E6-41C1-9B4C-E4C20619C14D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{46D26418-BF6C-4743-A862-B88FB2C1209D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{20C124DF-2D95-4A5E-B0D4-ED958AC21D66}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{4A2144EA-773A-4645-857F-C730AF25557C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{B4448892-B17A-402E-A02A-C7CCA5BFE00B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{9C430847-57F6-4465-996B-0F2203510B6D}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8042448A-EB54-4EBB-A1E0-BAA0B5A343D8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{36141B8B-E6F5-4AAF-A053-BDD189531BAF}"
@@ -25,6 +35,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{888B9739-0B7
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{AC3F6844-B70D-4DC3-A930-43073DA6F2D8}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CABCA940-694B-4ED8-9239-411DE575C92D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{CBA9A586-579F-4271-BD99-29C80BE189E5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{1F6EC09A-35CD-4D9A-ACF8-F0C61786E0BB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{C54C5A63-4C70-40F0-9F7F-6E2432A24617}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,6 +85,26 @@ Global
 		{25C578E4-95E6-41C1-9B4C-E4C20619C14D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25C578E4-95E6-41C1-9B4C-E4C20619C14D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{25C578E4-95E6-41C1-9B4C-E4C20619C14D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46D26418-BF6C-4743-A862-B88FB2C1209D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46D26418-BF6C-4743-A862-B88FB2C1209D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46D26418-BF6C-4743-A862-B88FB2C1209D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46D26418-BF6C-4743-A862-B88FB2C1209D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20C124DF-2D95-4A5E-B0D4-ED958AC21D66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20C124DF-2D95-4A5E-B0D4-ED958AC21D66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20C124DF-2D95-4A5E-B0D4-ED958AC21D66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20C124DF-2D95-4A5E-B0D4-ED958AC21D66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A2144EA-773A-4645-857F-C730AF25557C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A2144EA-773A-4645-857F-C730AF25557C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A2144EA-773A-4645-857F-C730AF25557C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A2144EA-773A-4645-857F-C730AF25557C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4448892-B17A-402E-A02A-C7CCA5BFE00B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4448892-B17A-402E-A02A-C7CCA5BFE00B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4448892-B17A-402E-A02A-C7CCA5BFE00B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4448892-B17A-402E-A02A-C7CCA5BFE00B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C430847-57F6-4465-996B-0F2203510B6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C430847-57F6-4465-996B-0F2203510B6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C430847-57F6-4465-996B-0F2203510B6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C430847-57F6-4465-996B-0F2203510B6D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -81,6 +119,14 @@ Global
 		{74DEABD1-2996-4B68-8D08-B5BD4F467172} = {AC3F6844-B70D-4DC3-A930-43073DA6F2D8}
 		{B9224F74-9714-4C37-895C-BFAE0FC97B59} = {AC3F6844-B70D-4DC3-A930-43073DA6F2D8}
 		{C07D96C2-F7BA-45D5-BAE2-C06B68FF9F05} = {AC3F6844-B70D-4DC3-A930-43073DA6F2D8}
+		{46D26418-BF6C-4743-A862-B88FB2C1209D} = {CABCA940-694B-4ED8-9239-411DE575C92D}
+		{20C124DF-2D95-4A5E-B0D4-ED958AC21D66} = {CABCA940-694B-4ED8-9239-411DE575C92D}
+		{CABCA940-694B-4ED8-9239-411DE575C92D} = {C54C5A63-4C70-40F0-9F7F-6E2432A24617}
+		{4A2144EA-773A-4645-857F-C730AF25557C} = {CBA9A586-579F-4271-BD99-29C80BE189E5}
+		{B4448892-B17A-402E-A02A-C7CCA5BFE00B} = {CBA9A586-579F-4271-BD99-29C80BE189E5}
+		{CBA9A586-579F-4271-BD99-29C80BE189E5} = {C54C5A63-4C70-40F0-9F7F-6E2432A24617}
+		{9C430847-57F6-4465-996B-0F2203510B6D} = {1F6EC09A-35CD-4D9A-ACF8-F0C61786E0BB}
+		{1F6EC09A-35CD-4D9A-ACF8-F0C61786E0BB} = {C54C5A63-4C70-40F0-9F7F-6E2432A24617}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9FDF2FF3-5DFC-45E8-9959-B59FF906E689}
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln b/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
index e2fd034c8e6ca..bf2afdb2c49ec 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
@@ -1,6 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{0BC84292-E0FC-4A10-87A3-3F0A5167541F}"
+EndProject
 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.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\ref\System.Configuration.ConfigurationManager.csproj", "{067570A0-D55A-4ECC-A478-B1CBC676E9F3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj", "{96328529-3EB5-4BA4-9998-CB85E279E7F2}"
@@ -17,12 +21,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Performa
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{2AFAE46F-B182-4F1E-9F5F-D3EB747A714A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{C8008A7A-9910-4D19-AB2B-B96FF8538139}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{42924B5B-3EED-440B-9CB5-67F44F6E1592}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{9F6EC049-D2C2-4228-B043-96D0918DF894}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{11F700BE-429D-4AAA-B797-4C6322503872}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{1AB14FD6-D3B1-4FE4-9595-F51D53584568}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}"
+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}"
@@ -35,115 +47,708 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B9925565-A803-4F7E-BABC-377A5DE41344}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{DCE05EB6-6F18-48C1-9252-994EC75601E6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{9C0272A9-70D5-4917-B918-9E44F14B0488}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{0C89B197-6F7B-48BE-A6B9-885DAD4BDFBE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B9925565-A803-4F7E-BABC-377A5DE41344}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F2408438-D7E0-4D89-97B1-EDCC83EA8442}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{651A1BB1-501D-45DA-9284-77F8FC083889}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{9C612F41-D9CB-48D7-92BE-B364078E1D66}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{6DCD869A-C586-4328-B60E-0086398DBA35}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{3C20311A-FA3F-4B39-AC72-103011866E88}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{8374E1B5-B64E-496F-86C2-D8907A804B9C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm = Debug|arm
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm = Release|arm
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Debug|Any CPU.Build.0 = Debug|x64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Debug|arm.ActiveCfg = Debug|arm
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Debug|arm.Build.0 = Debug|arm
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Debug|arm64.ActiveCfg = Debug|arm64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Debug|arm64.Build.0 = Debug|arm64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Debug|x64.ActiveCfg = Debug|x64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Debug|x64.Build.0 = Debug|x64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Debug|x86.ActiveCfg = Debug|x86
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Debug|x86.Build.0 = Debug|x86
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Release|Any CPU.ActiveCfg = Release|x64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Release|Any CPU.Build.0 = Release|x64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Release|arm.ActiveCfg = Release|arm
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Release|arm.Build.0 = Release|arm
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Release|arm64.ActiveCfg = Release|arm64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Release|arm64.Build.0 = Release|arm64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Release|x64.ActiveCfg = Release|x64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Release|x64.Build.0 = Release|x64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Release|x86.ActiveCfg = Release|x86
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Release|x86.Build.0 = Release|x86
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Checked|Any CPU.Build.0 = Checked|x64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Checked|arm.ActiveCfg = Checked|arm
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Checked|arm.Build.0 = Checked|arm
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Checked|arm64.ActiveCfg = Checked|arm64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Checked|arm64.Build.0 = Checked|arm64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Checked|x64.ActiveCfg = Checked|x64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Checked|x64.Build.0 = Checked|x64
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Checked|x86.ActiveCfg = Checked|x86
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F}.Checked|x86.Build.0 = Checked|x86
 		{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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Debug|x64.Build.0 = Debug|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Debug|x86.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
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Release|arm.ActiveCfg = Release|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Release|arm64.ActiveCfg = Release|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Release|x64.ActiveCfg = Release|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Release|x64.Build.0 = Release|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Release|x86.ActiveCfg = Release|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Release|x86.Build.0 = Release|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Debug|x64.Build.0 = Debug|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Debug|x86.Build.0 = Debug|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Release|arm.ActiveCfg = Release|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Release|x64.ActiveCfg = Release|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Release|x64.Build.0 = Release|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Release|x86.ActiveCfg = Release|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Release|x86.Build.0 = Release|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Debug|x64.Build.0 = Debug|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Debug|x86.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
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Release|arm.ActiveCfg = Release|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Release|arm64.ActiveCfg = Release|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Release|x64.ActiveCfg = Release|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Release|x64.Build.0 = Release|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Release|x86.ActiveCfg = Release|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Release|x86.Build.0 = Release|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Debug|x64.Build.0 = Debug|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Debug|x86.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
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Release|arm.ActiveCfg = Release|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Release|arm64.ActiveCfg = Release|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Release|x64.ActiveCfg = Release|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Release|x64.Build.0 = Release|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Release|x86.ActiveCfg = Release|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Release|x86.Build.0 = Release|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Debug|x64.Build.0 = Debug|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Debug|x86.Build.0 = Debug|Any CPU
 		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Release|Any CPU.Build.0 = Release|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Release|arm.ActiveCfg = Release|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Release|arm64.ActiveCfg = Release|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Release|x64.ActiveCfg = Release|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Release|x64.Build.0 = Release|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Release|x86.ActiveCfg = Release|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Release|x86.Build.0 = Release|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Debug|x64.Build.0 = Debug|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Debug|x86.Build.0 = Debug|Any CPU
 		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Release|arm.ActiveCfg = Release|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Release|x64.ActiveCfg = Release|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Release|x64.Build.0 = Release|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Release|x86.ActiveCfg = Release|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Release|x86.Build.0 = Release|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Debug|x64.Build.0 = Debug|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Debug|x86.Build.0 = Debug|Any CPU
 		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Release|arm.ActiveCfg = Release|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Release|x64.ActiveCfg = Release|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Release|x64.Build.0 = Release|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Release|x86.ActiveCfg = Release|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Release|x86.Build.0 = Release|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Debug|x64.Build.0 = Debug|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Debug|x86.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
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Release|arm.ActiveCfg = Release|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Release|x64.ActiveCfg = Release|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Release|x64.Build.0 = Release|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Release|x86.ActiveCfg = Release|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Release|x86.Build.0 = Release|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Debug|x64.Build.0 = Debug|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Debug|x86.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
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Release|arm.ActiveCfg = Release|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Release|x64.ActiveCfg = Release|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Release|x64.Build.0 = Release|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Release|x86.ActiveCfg = Release|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Release|x86.Build.0 = Release|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Debug|x64.Build.0 = Debug|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Debug|x86.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
-		{2AFAE46F-B182-4F1E-9F5F-D3EB747A714A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2AFAE46F-B182-4F1E-9F5F-D3EB747A714A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2AFAE46F-B182-4F1E-9F5F-D3EB747A714A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2AFAE46F-B182-4F1E-9F5F-D3EB747A714A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Release|arm.ActiveCfg = Release|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Release|arm64.ActiveCfg = Release|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Release|x64.ActiveCfg = Release|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Release|x64.Build.0 = Release|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Release|x86.ActiveCfg = Release|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Release|x86.Build.0 = Release|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Debug|x64.Build.0 = Debug|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Debug|x86.Build.0 = Debug|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Release|arm.ActiveCfg = Release|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Release|x64.ActiveCfg = Release|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Release|x64.Build.0 = Release|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Release|x86.ActiveCfg = Release|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Release|x86.Build.0 = Release|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Debug|x64.Build.0 = Debug|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Debug|x86.Build.0 = Debug|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Release|arm.ActiveCfg = Release|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Release|arm64.ActiveCfg = Release|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Release|x64.ActiveCfg = Release|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Release|x64.Build.0 = Release|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Release|x86.ActiveCfg = Release|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Release|x86.Build.0 = Release|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Debug|x64.Build.0 = Debug|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Debug|x86.Build.0 = Debug|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Release|arm.ActiveCfg = Release|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Release|x64.ActiveCfg = Release|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Release|x64.Build.0 = Release|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Release|x86.ActiveCfg = Release|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Release|x86.Build.0 = Release|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9F6EC049-D2C2-4228-B043-96D0918DF894}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{11F700BE-429D-4AAA-B797-4C6322503872}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{11F700BE-429D-4AAA-B797-4C6322503872}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Debug|x64.Build.0 = Debug|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Debug|x86.Build.0 = Debug|Any CPU
 		{11F700BE-429D-4AAA-B797-4C6322503872}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11F700BE-429D-4AAA-B797-4C6322503872}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Release|arm.ActiveCfg = Release|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Release|arm64.ActiveCfg = Release|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Release|x64.ActiveCfg = Release|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Release|x64.Build.0 = Release|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Release|x86.ActiveCfg = Release|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Release|x86.Build.0 = Release|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{11F700BE-429D-4AAA-B797-4C6322503872}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Debug|x64.Build.0 = Debug|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Debug|x86.Build.0 = Debug|Any CPU
 		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Release|arm.ActiveCfg = Release|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Release|x64.ActiveCfg = Release|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Release|x64.Build.0 = Release|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Release|x86.ActiveCfg = Release|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Release|x86.Build.0 = Release|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Debug|x64.Build.0 = Debug|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Debug|x86.Build.0 = Debug|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Release|arm.ActiveCfg = Release|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Release|x64.ActiveCfg = Release|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Release|x64.Build.0 = Release|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Release|x86.ActiveCfg = Release|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Release|x86.Build.0 = Release|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Debug|x64.Build.0 = Debug|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Debug|x86.Build.0 = Debug|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Release|arm.ActiveCfg = Release|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Release|x64.ActiveCfg = Release|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Release|x64.Build.0 = Release|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Release|x86.ActiveCfg = Release|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Release|x86.Build.0 = Release|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Debug|x64.Build.0 = Debug|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Debug|x86.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
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Release|arm.ActiveCfg = Release|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Release|x64.ActiveCfg = Release|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Release|x64.Build.0 = Release|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Release|x86.ActiveCfg = Release|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Release|x86.Build.0 = Release|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Debug|x64.Build.0 = Debug|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Debug|x86.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
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Release|arm.ActiveCfg = Release|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Release|arm64.ActiveCfg = Release|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Release|x64.ActiveCfg = Release|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Release|x64.Build.0 = Release|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Release|x86.ActiveCfg = Release|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Release|x86.Build.0 = Release|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Debug|x64.Build.0 = Debug|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Debug|x86.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
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Release|arm.ActiveCfg = Release|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Release|x64.ActiveCfg = Release|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Release|x64.Build.0 = Release|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Release|x86.ActiveCfg = Release|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Release|x86.Build.0 = Release|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Debug|x64.Build.0 = Debug|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Debug|x86.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
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Release|arm.ActiveCfg = Release|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Release|x64.ActiveCfg = Release|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Release|x64.Build.0 = Release|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Release|x86.ActiveCfg = Release|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Release|x86.Build.0 = Release|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Debug|x64.Build.0 = Debug|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Debug|x86.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
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Release|arm.ActiveCfg = Release|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Release|arm64.ActiveCfg = Release|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Release|x64.ActiveCfg = Release|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Release|x64.Build.0 = Release|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Release|x86.ActiveCfg = Release|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Release|x86.Build.0 = Release|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Debug|x64.Build.0 = Debug|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Debug|x86.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
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Release|arm.ActiveCfg = Release|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Release|arm64.ActiveCfg = Release|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Release|x64.ActiveCfg = Release|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Release|x64.Build.0 = Release|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Release|x86.ActiveCfg = Release|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Release|x86.Build.0 = Release|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Debug|x64.Build.0 = Debug|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Debug|x86.Build.0 = Debug|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Release|arm.ActiveCfg = Release|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Release|x64.ActiveCfg = Release|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Release|x64.Build.0 = Release|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Release|x86.ActiveCfg = Release|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Release|x86.Build.0 = Release|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Debug|x64.Build.0 = Debug|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Debug|x86.Build.0 = Debug|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Release|arm.ActiveCfg = Release|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Release|x64.ActiveCfg = Release|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Release|x64.Build.0 = Release|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Release|x86.ActiveCfg = Release|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Release|x86.Build.0 = Release|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Debug|x64.Build.0 = Debug|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Debug|x86.Build.0 = Debug|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Release|arm.ActiveCfg = Release|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Release|x64.ActiveCfg = Release|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Release|x64.Build.0 = Release|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Release|x86.ActiveCfg = Release|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Release|x86.Build.0 = Release|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Debug|x64.Build.0 = Debug|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Debug|x86.Build.0 = Debug|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Release|arm.ActiveCfg = Release|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Release|x64.ActiveCfg = Release|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Release|x64.Build.0 = Release|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Release|x86.ActiveCfg = Release|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Release|x86.Build.0 = Release|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9C0272A9-70D5-4917-B918-9E44F14B0488}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Debug|x64.Build.0 = Debug|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Debug|x86.Build.0 = Debug|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Release|arm.ActiveCfg = Release|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Release|arm64.ActiveCfg = Release|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Release|x64.ActiveCfg = Release|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Release|x64.Build.0 = Release|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Release|x86.ActiveCfg = Release|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Release|x86.Build.0 = Release|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{0BC84292-E0FC-4A10-87A3-3F0A5167541F} = {0C89B197-6F7B-48BE-A6B9-885DAD4BDFBE}
 		{20B92E8C-E720-4B5A-8647-97CC1BD71E84} = {B9925565-A803-4F7E-BABC-377A5DE41344}
 		{EB8EF358-4028-4272-B71E-523F8D0A73F0} = {B9925565-A803-4F7E-BABC-377A5DE41344}
-		{067570A0-D55A-4ECC-A478-B1CBC676E9F3} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
-		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
-		{D0C681EE-D578-4CD6-AA62-33874FCE3E37} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
-		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
-		{F8480484-A2CA-4215-AC4B-82F6149FEC02} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
-		{97932D09-4DF9-4836-ADEF-C52DBC0661CD} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
+		{1E95BC53-583D-4DDD-9E70-6F04D2D0C991} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
 		{96328529-3EB5-4BA4-9998-CB85E279E7F2} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
 		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
 		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
 		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
+		{9F6EC049-D2C2-4228-B043-96D0918DF894} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
+		{3BD4F46F-4EF5-478C-9FA4-C8ABE2E703DF} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
 		{43214093-FA08-4699-A62B-D7BC858BAC78} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
 		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
 		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
-		{2AFAE46F-B182-4F1E-9F5F-D3EB747A714A} = {651A1BB1-501D-45DA-9284-77F8FC083889}
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
+		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
+		{42924B5B-3EED-440B-9CB5-67F44F6E1592} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
+		{1AB14FD6-D3B1-4FE4-9595-F51D53584568} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
+		{C8008A7A-9910-4D19-AB2B-B96FF8538139} = {651A1BB1-501D-45DA-9284-77F8FC083889}
 		{11F700BE-429D-4AAA-B797-4C6322503872} = {651A1BB1-501D-45DA-9284-77F8FC083889}
 		{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3} = {651A1BB1-501D-45DA-9284-77F8FC083889}
+		{E33CEC60-CDBC-42F4-BF7C-55BFD8D3F9C2} = {9C612F41-D9CB-48D7-92BE-B364078E1D66}
+		{AFDC7537-6348-49DD-A678-62BC2AEB6A2D} = {9C612F41-D9CB-48D7-92BE-B364078E1D66}
+		{9C612F41-D9CB-48D7-92BE-B364078E1D66} = {8374E1B5-B64E-496F-86C2-D8907A804B9C}
+		{DCE05EB6-6F18-48C1-9252-994EC75601E6} = {6DCD869A-C586-4328-B60E-0086398DBA35}
+		{9C0272A9-70D5-4917-B918-9E44F14B0488} = {6DCD869A-C586-4328-B60E-0086398DBA35}
+		{6DCD869A-C586-4328-B60E-0086398DBA35} = {8374E1B5-B64E-496F-86C2-D8907A804B9C}
+		{5489EFA6-E32A-4B53-AC04-862DCE8B4E86} = {3C20311A-FA3F-4B39-AC72-103011866E88}
+		{3C20311A-FA3F-4B39-AC72-103011866E88} = {8374E1B5-B64E-496F-86C2-D8907A804B9C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {51062B21-546F-4B2A-A2B8-77ABF1079C06}
diff --git a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln
index c66b79308c95f..6ac4b2f6d0d21 100644
--- a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln
+++ b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln
@@ -1,10 +1,14 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{946BAB0E-CD71-4456-9FBB-2066470A83B5}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{359DC957-11BD-4934-88BB-15744852E6BA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{33163E79-02D8-4ED2-BED9-3A96D94B7D41}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj", "{0EB76163-3756-4217-A1EE-76E39A822728}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Specialized", "..\System.Collections.Specialized\ref\System.Collections.Specialized.csproj", "{34117938-CD34-41F6-9B79-E7868435F303}"
@@ -37,6 +41,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ObjectModel", "..\System.ObjectModel\ref\System.ObjectModel.csproj", "{E4D48405-30B4-4CEC-925B-851133BACC3D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{1B7EED4E-D261-4795-84FA-1B948B6E9E53}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{ABF31AAD-012E-4DD3-9B10-2F4590333A22}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}"
@@ -47,6 +57,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{31A2D9B9-434C-4859-A78E-90E912FB86C1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims", "..\System.Security.Claims\ref\System.Security.Claims.csproj", "{07A70B08-8CD2-4441-B619-2674A8384077}"
@@ -65,6 +77,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{9A6E8083-DD07-4006-831D-23C49831981A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{D3D0D188-947E-46E2-9B61-388B34B3140E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{EAE01BBD-4707-499B-8E8D-567F1694EF98}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{DB6DC8D8-7329-4427-9641-1415ACF118A6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{3A466C9C-F42B-462A-9D0B-96CDA47A8210}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{C5847D76-464F-49B7-B5BE-80F9FCA55883}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0F383187-7D3B-4EF3-844B-CFBE0276A7B8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}"
@@ -73,149 +97,972 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B27D0964-41D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{8CB89ED5-7600-48B5-B7F4-72026EB9F533}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{AB1A5F67-F907-4B8C-9076-1279BC039D8C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{0ECB6471-9FBC-467D-870F-458C231E7B9D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{0F35AB40-A435-463A-914A-5339D0ED4A0F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{41A7005B-1CD2-4EC1-BFC8-D0886ED4B7BB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm = Debug|arm
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm = Release|arm
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Debug|Any CPU.Build.0 = Debug|x64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Debug|arm.ActiveCfg = Debug|arm
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Debug|arm.Build.0 = Debug|arm
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Debug|arm64.ActiveCfg = Debug|arm64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Debug|arm64.Build.0 = Debug|arm64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Debug|x64.ActiveCfg = Debug|x64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Debug|x64.Build.0 = Debug|x64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Debug|x86.ActiveCfg = Debug|x86
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Debug|x86.Build.0 = Debug|x86
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Release|Any CPU.ActiveCfg = Release|x64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Release|Any CPU.Build.0 = Release|x64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Release|arm.ActiveCfg = Release|arm
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Release|arm.Build.0 = Release|arm
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Release|arm64.ActiveCfg = Release|arm64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Release|arm64.Build.0 = Release|arm64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Release|x64.ActiveCfg = Release|x64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Release|x64.Build.0 = Release|x64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Release|x86.ActiveCfg = Release|x86
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Release|x86.Build.0 = Release|x86
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Checked|Any CPU.Build.0 = Checked|x64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Checked|arm.ActiveCfg = Checked|arm
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Checked|arm.Build.0 = Checked|arm
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Checked|arm64.ActiveCfg = Checked|arm64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Checked|arm64.Build.0 = Checked|arm64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Checked|x64.ActiveCfg = Checked|x64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Checked|x64.Build.0 = Checked|x64
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Checked|x86.ActiveCfg = Checked|x86
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5}.Checked|x86.Build.0 = Checked|x86
 		{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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Debug|x64.Build.0 = Debug|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Debug|x86.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
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Release|arm.ActiveCfg = Release|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Release|x64.ActiveCfg = Release|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Release|x64.Build.0 = Release|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Release|x86.ActiveCfg = Release|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Release|x86.Build.0 = Release|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{359DC957-11BD-4934-88BB-15744852E6BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{359DC957-11BD-4934-88BB-15744852E6BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Debug|x64.Build.0 = Debug|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Debug|x86.Build.0 = Debug|Any CPU
 		{359DC957-11BD-4934-88BB-15744852E6BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{359DC957-11BD-4934-88BB-15744852E6BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Release|arm.ActiveCfg = Release|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Release|x64.ActiveCfg = Release|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Release|x64.Build.0 = Release|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Release|x86.ActiveCfg = Release|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Release|x86.Build.0 = Release|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{359DC957-11BD-4934-88BB-15744852E6BA}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Debug|x86.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
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Release|arm.ActiveCfg = Release|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Release|x64.Build.0 = Release|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Release|x86.Build.0 = Release|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Debug|x64.Build.0 = Debug|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Debug|x86.Build.0 = Debug|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Release|arm.ActiveCfg = Release|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Release|arm64.ActiveCfg = Release|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Release|x64.ActiveCfg = Release|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Release|x64.Build.0 = Release|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Release|x86.ActiveCfg = Release|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Release|x86.Build.0 = Release|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{0EB76163-3756-4217-A1EE-76E39A822728}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0EB76163-3756-4217-A1EE-76E39A822728}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Debug|x64.Build.0 = Debug|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Debug|x86.Build.0 = Debug|Any CPU
 		{0EB76163-3756-4217-A1EE-76E39A822728}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0EB76163-3756-4217-A1EE-76E39A822728}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Release|arm.ActiveCfg = Release|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Release|arm64.ActiveCfg = Release|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Release|x64.ActiveCfg = Release|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Release|x64.Build.0 = Release|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Release|x86.ActiveCfg = Release|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Release|x86.Build.0 = Release|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0EB76163-3756-4217-A1EE-76E39A822728}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{34117938-CD34-41F6-9B79-E7868435F303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{34117938-CD34-41F6-9B79-E7868435F303}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Debug|x64.Build.0 = Debug|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Debug|x86.Build.0 = Debug|Any CPU
 		{34117938-CD34-41F6-9B79-E7868435F303}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{34117938-CD34-41F6-9B79-E7868435F303}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Release|arm.ActiveCfg = Release|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Release|arm64.ActiveCfg = Release|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Release|x64.ActiveCfg = Release|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Release|x64.Build.0 = Release|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Release|x86.ActiveCfg = Release|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Release|x86.Build.0 = Release|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{34117938-CD34-41F6-9B79-E7868435F303}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Debug|x64.Build.0 = Debug|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Debug|x86.Build.0 = Debug|Any CPU
 		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Release|arm.ActiveCfg = Release|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Release|x64.ActiveCfg = Release|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Release|x64.Build.0 = Release|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Release|x86.ActiveCfg = Release|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Release|x86.Build.0 = Release|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9343C704-F44E-4FAD-81AF-DAE87DDF2E79}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Debug|x64.Build.0 = Debug|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Debug|x86.Build.0 = Debug|Any CPU
 		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Release|arm.ActiveCfg = Release|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Release|arm64.ActiveCfg = Release|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Release|x64.ActiveCfg = Release|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Release|x64.Build.0 = Release|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Release|x86.ActiveCfg = Release|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Release|x86.Build.0 = Release|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EEDB3FA5-6E87-4066-99CB-FB1E19845293}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Debug|x64.Build.0 = Debug|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Debug|x86.Build.0 = Debug|Any CPU
 		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Release|arm.ActiveCfg = Release|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Release|x64.ActiveCfg = Release|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Release|x64.Build.0 = Release|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Release|x86.ActiveCfg = Release|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Release|x86.Build.0 = Release|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{76946469-3342-4FE2-BB84-1E86B627B4A1}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Debug|x64.Build.0 = Debug|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Debug|x86.Build.0 = Debug|Any CPU
 		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Release|arm.ActiveCfg = Release|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Release|x64.ActiveCfg = Release|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Release|x64.Build.0 = Release|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Release|x86.ActiveCfg = Release|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Release|x86.Build.0 = Release|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8AB3FEA8-7075-4BB9-BDCD-430F72B0A096}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Debug|x64.Build.0 = Debug|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Debug|x86.Build.0 = Debug|Any CPU
 		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Release|arm.ActiveCfg = Release|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Release|x64.ActiveCfg = Release|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Release|x64.Build.0 = Release|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Release|x86.ActiveCfg = Release|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Release|x86.Build.0 = Release|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F65F6021-37F2-450B-B8BF-66F04B56DE56}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Debug|x64.Build.0 = Debug|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Debug|x86.Build.0 = Debug|Any CPU
 		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Release|arm.ActiveCfg = Release|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Release|x64.ActiveCfg = Release|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Release|x64.Build.0 = Release|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Release|x86.ActiveCfg = Release|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Release|x86.Build.0 = Release|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Debug|x64.Build.0 = Debug|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Debug|x86.Build.0 = Debug|Any CPU
 		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Release|arm.ActiveCfg = Release|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Release|arm64.ActiveCfg = Release|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Release|x64.ActiveCfg = Release|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Release|x64.Build.0 = Release|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Release|x86.ActiveCfg = Release|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Release|x86.Build.0 = Release|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Debug|x64.Build.0 = Debug|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Debug|x86.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
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Release|arm.ActiveCfg = Release|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Release|x64.ActiveCfg = Release|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Release|x64.Build.0 = Release|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Release|x86.ActiveCfg = Release|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Release|x86.Build.0 = Release|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Debug|x64.Build.0 = Debug|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Debug|x86.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
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Release|arm.ActiveCfg = Release|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Release|x64.ActiveCfg = Release|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Release|x64.Build.0 = Release|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Release|x86.ActiveCfg = Release|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Release|x86.Build.0 = Release|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Debug|x64.Build.0 = Debug|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Debug|x86.Build.0 = Debug|Any CPU
 		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Release|arm.ActiveCfg = Release|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Release|x64.ActiveCfg = Release|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Release|x64.Build.0 = Release|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Release|x86.ActiveCfg = Release|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Release|x86.Build.0 = Release|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C67553AE-F09B-407D-AD3E-D61950E06BE8}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Debug|x64.Build.0 = Debug|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Debug|x86.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
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Release|arm.ActiveCfg = Release|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Release|x64.ActiveCfg = Release|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Release|x64.Build.0 = Release|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Release|x86.ActiveCfg = Release|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Release|x86.Build.0 = Release|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Debug|x64.Build.0 = Debug|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Debug|x86.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
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Release|arm.ActiveCfg = Release|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Release|x64.ActiveCfg = Release|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Release|x64.Build.0 = Release|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Release|x86.ActiveCfg = Release|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Release|x86.Build.0 = Release|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Debug|x64.Build.0 = Debug|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Debug|x86.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
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Release|arm.ActiveCfg = Release|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Release|arm64.ActiveCfg = Release|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Release|x64.ActiveCfg = Release|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Release|x64.Build.0 = Release|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Release|x86.ActiveCfg = Release|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Release|x86.Build.0 = Release|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Debug|x64.Build.0 = Debug|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Debug|x86.Build.0 = Debug|Any CPU
 		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Release|arm.ActiveCfg = Release|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Release|x64.ActiveCfg = Release|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Release|x64.Build.0 = Release|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Release|x86.ActiveCfg = Release|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Release|x86.Build.0 = Release|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Debug|x64.Build.0 = Debug|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Debug|x86.Build.0 = Debug|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Release|arm.ActiveCfg = Release|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Release|x64.ActiveCfg = Release|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Release|x64.Build.0 = Release|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Release|x86.ActiveCfg = Release|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Release|x86.Build.0 = Release|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Debug|x64.Build.0 = Debug|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Debug|x86.Build.0 = Debug|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Release|arm.ActiveCfg = Release|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Release|x64.ActiveCfg = Release|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Release|x64.Build.0 = Release|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Release|x86.ActiveCfg = Release|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Release|x86.Build.0 = Release|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Debug|x64.Build.0 = Debug|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Debug|x86.Build.0 = Debug|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Release|arm.ActiveCfg = Release|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Release|arm64.ActiveCfg = Release|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Release|x64.ActiveCfg = Release|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Release|x64.Build.0 = Release|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Release|x86.ActiveCfg = Release|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Release|x86.Build.0 = Release|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Debug|x64.Build.0 = Debug|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Debug|x86.Build.0 = Debug|Any CPU
 		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Release|arm.ActiveCfg = Release|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Release|arm64.ActiveCfg = Release|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Release|x64.ActiveCfg = Release|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Release|x64.Build.0 = Release|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Release|x86.ActiveCfg = Release|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Release|x86.Build.0 = Release|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{ABF31AAD-012E-4DD3-9B10-2F4590333A22}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Debug|x64.Build.0 = Debug|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Debug|x86.Build.0 = Debug|Any CPU
 		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Release|arm.ActiveCfg = Release|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Release|x64.ActiveCfg = Release|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Release|x64.Build.0 = Release|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Release|x86.ActiveCfg = Release|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Release|x86.Build.0 = Release|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{FD985738-3603-4C41-9FDE-1C96F7922725}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD985738-3603-4C41-9FDE-1C96F7922725}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Debug|x64.Build.0 = Debug|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Debug|x86.Build.0 = Debug|Any CPU
 		{FD985738-3603-4C41-9FDE-1C96F7922725}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD985738-3603-4C41-9FDE-1C96F7922725}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Release|arm.ActiveCfg = Release|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Release|arm64.ActiveCfg = Release|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Release|x64.ActiveCfg = Release|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Release|x64.Build.0 = Release|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Release|x86.ActiveCfg = Release|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Release|x86.Build.0 = Release|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FD985738-3603-4C41-9FDE-1C96F7922725}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Debug|x64.Build.0 = Debug|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Debug|x86.Build.0 = Debug|Any CPU
 		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Release|arm.ActiveCfg = Release|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Release|x64.ActiveCfg = Release|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Release|x64.Build.0 = Release|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Release|x86.ActiveCfg = Release|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Release|x86.Build.0 = Release|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Debug|x64.Build.0 = Debug|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Debug|x86.Build.0 = Debug|Any CPU
 		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Release|arm.ActiveCfg = Release|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Release|arm64.ActiveCfg = Release|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Release|x64.ActiveCfg = Release|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Release|x64.Build.0 = Release|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Release|x86.ActiveCfg = Release|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Release|x86.Build.0 = Release|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Debug|x64.Build.0 = Debug|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Debug|x86.Build.0 = Debug|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Release|arm.ActiveCfg = Release|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Release|x64.ActiveCfg = Release|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Release|x64.Build.0 = Release|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Release|x86.ActiveCfg = Release|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Release|x86.Build.0 = Release|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Debug|x64.Build.0 = Debug|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Debug|x86.Build.0 = Debug|Any CPU
 		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Release|arm.ActiveCfg = Release|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Release|x64.ActiveCfg = Release|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Release|x64.Build.0 = Release|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Release|x86.ActiveCfg = Release|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Release|x86.Build.0 = Release|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{31A2D9B9-434C-4859-A78E-90E912FB86C1}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{07A70B08-8CD2-4441-B619-2674A8384077}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{07A70B08-8CD2-4441-B619-2674A8384077}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Debug|x64.Build.0 = Debug|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Debug|x86.Build.0 = Debug|Any CPU
 		{07A70B08-8CD2-4441-B619-2674A8384077}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07A70B08-8CD2-4441-B619-2674A8384077}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Release|arm.ActiveCfg = Release|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Release|arm64.ActiveCfg = Release|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Release|x64.ActiveCfg = Release|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Release|x64.Build.0 = Release|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Release|x86.ActiveCfg = Release|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Release|x86.Build.0 = Release|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{07A70B08-8CD2-4441-B619-2674A8384077}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Debug|x64.Build.0 = Debug|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Debug|x86.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
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Release|arm.ActiveCfg = Release|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Release|x64.ActiveCfg = Release|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Release|x64.Build.0 = Release|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Release|x86.ActiveCfg = Release|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Release|x86.Build.0 = Release|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Debug|x64.Build.0 = Debug|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Debug|x86.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
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Release|arm.ActiveCfg = Release|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Release|x64.ActiveCfg = Release|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Release|x64.Build.0 = Release|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Release|x86.ActiveCfg = Release|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Release|x86.Build.0 = Release|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Debug|x64.Build.0 = Debug|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Debug|x86.Build.0 = Debug|Any CPU
 		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Release|arm.ActiveCfg = Release|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Release|x64.ActiveCfg = Release|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Release|x64.Build.0 = Release|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Release|x86.ActiveCfg = Release|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Release|x86.Build.0 = Release|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Debug|x64.Build.0 = Debug|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Debug|x86.Build.0 = Debug|Any CPU
 		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Release|arm.ActiveCfg = Release|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Release|x64.ActiveCfg = Release|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Release|x64.Build.0 = Release|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Release|x86.ActiveCfg = Release|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Release|x86.Build.0 = Release|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Debug|x64.Build.0 = Debug|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Debug|x86.Build.0 = Debug|Any CPU
 		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Release|arm.ActiveCfg = Release|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Release|x64.ActiveCfg = Release|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Release|x64.Build.0 = Release|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Release|x86.ActiveCfg = Release|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Release|x86.Build.0 = Release|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Debug|x64.Build.0 = Debug|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Debug|x86.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
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Release|arm.ActiveCfg = Release|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Release|x64.ActiveCfg = Release|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Release|x64.Build.0 = Release|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Release|x86.ActiveCfg = Release|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Release|x86.Build.0 = Release|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Debug|x64.Build.0 = Debug|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Debug|x86.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
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Release|arm.ActiveCfg = Release|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Release|x64.ActiveCfg = Release|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Release|x64.Build.0 = Release|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Release|x86.ActiveCfg = Release|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Release|x86.Build.0 = Release|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Debug|x64.Build.0 = Debug|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Debug|x86.Build.0 = Debug|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Release|arm.ActiveCfg = Release|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Release|x64.ActiveCfg = Release|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Release|x64.Build.0 = Release|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Release|x86.ActiveCfg = Release|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Release|x86.Build.0 = Release|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9A6E8083-DD07-4006-831D-23C49831981A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Debug|x64.Build.0 = Debug|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Debug|x86.Build.0 = Debug|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Release|arm.ActiveCfg = Release|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Release|x64.ActiveCfg = Release|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Release|x64.Build.0 = Release|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Release|x86.ActiveCfg = Release|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Release|x86.Build.0 = Release|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D3D0D188-947E-46E2-9B61-388B34B3140E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Debug|x64.Build.0 = Debug|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Debug|x86.Build.0 = Debug|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Release|arm.ActiveCfg = Release|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Release|arm64.ActiveCfg = Release|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Release|x64.ActiveCfg = Release|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Release|x64.Build.0 = Release|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Release|x86.ActiveCfg = Release|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Release|x86.Build.0 = Release|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Debug|x64.Build.0 = Debug|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Debug|x86.Build.0 = Debug|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Release|arm.ActiveCfg = Release|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Release|x64.ActiveCfg = Release|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Release|x64.Build.0 = Release|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Release|x86.ActiveCfg = Release|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Release|x86.Build.0 = Release|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Debug|x64.Build.0 = Debug|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Debug|x86.Build.0 = Debug|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Release|arm.ActiveCfg = Release|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Release|arm64.ActiveCfg = Release|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Release|x64.ActiveCfg = Release|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Release|x64.Build.0 = Release|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Release|x86.ActiveCfg = Release|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Release|x86.Build.0 = Release|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{946BAB0E-CD71-4456-9FBB-2066470A83B5} = {C5847D76-464F-49B7-B5BE-80F9FCA55883}
 		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A} = {0F383187-7D3B-4EF3-844B-CFBE0276A7B8}
 		{C67553AE-F09B-407D-AD3E-D61950E06BE8} = {0F383187-7D3B-4EF3-844B-CFBE0276A7B8}
 		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D} = {0F383187-7D3B-4EF3-844B-CFBE0276A7B8}
@@ -230,6 +1077,7 @@ Global
 		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
 		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
 		{E4D48405-30B4-4CEC-925B-851133BACC3D} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
+		{1B7EED4E-D261-4795-84FA-1B948B6E9E53} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
 		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
 		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
 		{31A2D9B9-434C-4859-A78E-90E912FB86C1} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
@@ -239,16 +1087,28 @@ Global
 		{B43FFBD4-DD4A-4ED8-A69F-C562769A5085} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
 		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
 		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
+		{33163E79-02D8-4ED2-BED9-3A96D94B7D41} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
 		{F65F6021-37F2-450B-B8BF-66F04B56DE56} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
 		{D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
 		{314810DF-262E-490E-8F05-F31695C31F0C} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
 		{84075D59-9D5E-40F7-A914-911087419FE4} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
+		{FD0788DC-C765-41A8-9EBF-93DAAA92F9AD} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
+		{CEAF6846-A3EB-4DBF-897A-BD6A95BFB384} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
 		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
 		{DCBDA200-E9E4-49E9-A928-A50FA719F9ED} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
 		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
+		{4165769D-C4EE-46C4-9FA2-068DBF1BDB0A} = {8CB89ED5-7600-48B5-B7F4-72026EB9F533}
 		{ABF31AAD-012E-4DD3-9B10-2F4590333A22} = {8CB89ED5-7600-48B5-B7F4-72026EB9F533}
 		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E} = {8CB89ED5-7600-48B5-B7F4-72026EB9F533}
 		{FD985738-3603-4C41-9FDE-1C96F7922725} = {8CB89ED5-7600-48B5-B7F4-72026EB9F533}
+		{9A6E8083-DD07-4006-831D-23C49831981A} = {AB1A5F67-F907-4B8C-9076-1279BC039D8C}
+		{D3D0D188-947E-46E2-9B61-388B34B3140E} = {AB1A5F67-F907-4B8C-9076-1279BC039D8C}
+		{AB1A5F67-F907-4B8C-9076-1279BC039D8C} = {41A7005B-1CD2-4EC1-BFC8-D0886ED4B7BB}
+		{EAE01BBD-4707-499B-8E8D-567F1694EF98} = {0ECB6471-9FBC-467D-870F-458C231E7B9D}
+		{DB6DC8D8-7329-4427-9641-1415ACF118A6} = {0ECB6471-9FBC-467D-870F-458C231E7B9D}
+		{0ECB6471-9FBC-467D-870F-458C231E7B9D} = {41A7005B-1CD2-4EC1-BFC8-D0886ED4B7BB}
+		{3A466C9C-F42B-462A-9D0B-96CDA47A8210} = {0F35AB40-A435-463A-914A-5339D0ED4A0F}
+		{0F35AB40-A435-463A-914A-5339D0ED4A0F} = {41A7005B-1CD2-4EC1-BFC8-D0886ED4B7BB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B723DDA5-3A21-4A9C-A344-548BE6D05B72}
diff --git a/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln b/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
index 38689f1965126..ff6b2879f563c 100644
--- a/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
+++ b/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
@@ -51,14 +51,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\Syst
 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", "{C81302E5-C312-4C10-ACC7-D7201A16FAC6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{CABF1BE7-C382-4121-96C3-B25A18CC31B6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{3E0A6000-5E5D-46CE-A082-6379B18E56D4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{921D9613-0797-4016-8C51-47EB96764EA3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{04974279-7D70-4BE6-9F4C-23AF30F64C9B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{A801F00E-81F9-4531-B2D8-1C15CB6A34B0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A376B9EB-8223-464D-A8F5-0000B26254F4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ED3F0225-44AC-415A-80C8-18D9CAD10A64}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C81302E5-C312-4C10-ACC7-D7201A16FAC6}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CAB63FAF-D862-451E-84FF-115A7DABB4CA}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{A118A4EF-D9D1-4AC9-B0A6-C7A2A15A63C5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{08F83A99-B68D-4F24-86CA-121CF8D30418}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{57AE0EEE-0798-4319-9A33-56C7FD228E25}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{F8B374FD-7ECB-45EA-BBA9-F9F057EF34D7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -633,21 +653,117 @@ Global
 		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Checked|arm64.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
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Debug|x64.Build.0 = Debug|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Debug|x86.Build.0 = Debug|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Release|arm.ActiveCfg = Release|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Release|x64.ActiveCfg = Release|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Release|x64.Build.0 = Release|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Release|x86.ActiveCfg = Release|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Release|x86.Build.0 = Release|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Debug|x64.Build.0 = Debug|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Debug|x86.Build.0 = Debug|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Release|arm.ActiveCfg = Release|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Release|arm64.ActiveCfg = Release|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Release|x64.ActiveCfg = Release|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Release|x64.Build.0 = Release|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Release|x86.ActiveCfg = Release|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Release|x86.Build.0 = Release|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Debug|x64.Build.0 = Debug|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Debug|x86.Build.0 = Debug|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Release|arm.ActiveCfg = Release|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Release|arm64.ActiveCfg = Release|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Release|x64.ActiveCfg = Release|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Release|x64.Build.0 = Release|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Release|x86.ActiveCfg = Release|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Release|x86.Build.0 = Release|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{921D9613-0797-4016-8C51-47EB96764EA3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Debug|x64.Build.0 = Debug|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Debug|x86.Build.0 = Debug|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Release|arm.ActiveCfg = Release|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Release|x64.ActiveCfg = Release|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Release|x64.Build.0 = Release|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Release|x86.ActiveCfg = Release|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Release|x86.Build.0 = Release|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Debug|x64.Build.0 = Debug|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Debug|x86.Build.0 = Debug|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Release|arm.ActiveCfg = Release|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Release|x64.ActiveCfg = Release|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Release|x64.Build.0 = Release|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Release|x86.ActiveCfg = Release|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Release|x86.Build.0 = Release|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{E34F351F-8EB7-4D44-BA44-85F791F662CC} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{26367C54-C1A4-462F-AA71-E48644208AE9} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{1A44729F-AFB5-4BB0-8348-58833378AE55} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{96501106-36D0-4093-8FEE-AF90713D09ED} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{E6DD9860-2824-43D3-BD9D-87ED396B4E46} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{623D46A5-8ED4-43CF-A01B-528F0A505090} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{039BB256-1BCF-4398-B586-C05F7C5225C4} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC} = {A801F00E-81F9-4531-B2D8-1C15CB6A34B0}
 		{65FFFD20-CE5D-4FC0-A525-1C308186A16F} = {A376B9EB-8223-464D-A8F5-0000B26254F4}
 		{63860D71-D351-4285-9154-9864DC883647} = {A376B9EB-8223-464D-A8F5-0000B26254F4}
 		{956E53A2-5A41-44A7-900A-49044376B2BD} = {A376B9EB-8223-464D-A8F5-0000B26254F4}
@@ -660,10 +776,27 @@ Global
 		{1885EF4C-6A85-4170-8E5B-7C158C4BECDB} = {ED3F0225-44AC-415A-80C8-18D9CAD10A64}
 		{A311F690-FBE4-4102-849A-ABCCAC63805A} = {ED3F0225-44AC-415A-80C8-18D9CAD10A64}
 		{E93A6617-A6C4-4886-BADB-4D52690ACE8E} = {ED3F0225-44AC-415A-80C8-18D9CAD10A64}
+		{26367C54-C1A4-462F-AA71-E48644208AE9} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
+		{1A44729F-AFB5-4BB0-8348-58833378AE55} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
+		{96501106-36D0-4093-8FEE-AF90713D09ED} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
+		{623D46A5-8ED4-43CF-A01B-528F0A505090} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
+		{039BB256-1BCF-4398-B586-C05F7C5225C4} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
 		{0269FFAF-E680-4BC8-A1B4-0333D77911BC} = {CAB63FAF-D862-451E-84FF-115A7DABB4CA}
 		{F18C3460-7F92-4570-9DE9-32B3C3DA6DA8} = {CAB63FAF-D862-451E-84FF-115A7DABB4CA}
 		{56B120CF-EBB5-4422-A7B5-5216FE4F71E3} = {CAB63FAF-D862-451E-84FF-115A7DABB4CA}
 		{C0FDA629-485A-4795-80D1-BC228F610163} = {CAB63FAF-D862-451E-84FF-115A7DABB4CA}
+		{CABF1BE7-C382-4121-96C3-B25A18CC31B6} = {A118A4EF-D9D1-4AC9-B0A6-C7A2A15A63C5}
+		{3E0A6000-5E5D-46CE-A082-6379B18E56D4} = {A118A4EF-D9D1-4AC9-B0A6-C7A2A15A63C5}
+		{A118A4EF-D9D1-4AC9-B0A6-C7A2A15A63C5} = {F8B374FD-7ECB-45EA-BBA9-F9F057EF34D7}
+		{921D9613-0797-4016-8C51-47EB96764EA3} = {08F83A99-B68D-4F24-86CA-121CF8D30418}
+		{7AE13171-375E-4D54-91A5-4ADEDC18E7D0} = {08F83A99-B68D-4F24-86CA-121CF8D30418}
+		{08F83A99-B68D-4F24-86CA-121CF8D30418} = {F8B374FD-7ECB-45EA-BBA9-F9F057EF34D7}
+		{04974279-7D70-4BE6-9F4C-23AF30F64C9B} = {57AE0EEE-0798-4319-9A33-56C7FD228E25}
+		{57AE0EEE-0798-4319-9A33-56C7FD228E25} = {F8B374FD-7ECB-45EA-BBA9-F9F057EF34D7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1572B987-E4D6-45D5-82AB-9CC0BB306C2E}
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln b/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
index aa3620bce3a96..f9aea7ef82c4f 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
@@ -29,6 +29,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{7176D984-0BB0-4266-8D51-28562F5EFA02}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{8662AAE6-3C70-42C7-9FD0-AB204DFD6B9C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{DA30D375-A8AB-41D1-9936-D48A3F0D0B48}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{36F25033-47B0-42CC-9AD3-90371FEFB061}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{EE899E4A-F073-4E7E-B6F8-FE96696234BE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{8611AAFC-7370-48DA-AC22-3D0766B6B1FF}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C2EA1B5C-E1FF-491B-B243-17B133914DAE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{261ED6BF-3867-4A06-B9A3-4973BCAB5621}"
@@ -37,6 +47,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AA9494D5-6DB
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{4F17E201-98A0-44A6-8B34-BF3A4B5B5EA8}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{71027792-71B9-4E55-BCF3-88B01F6957CB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{757768C3-A60E-433B-A657-00BABF61A537}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{4A293856-6920-4843-AC64-8296E7B7389C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{89602401-88D0-4FE4-B2EF-257C5C536791}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -103,6 +121,26 @@ Global
 		{7176D984-0BB0-4266-8D51-28562F5EFA02}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7176D984-0BB0-4266-8D51-28562F5EFA02}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7176D984-0BB0-4266-8D51-28562F5EFA02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8662AAE6-3C70-42C7-9FD0-AB204DFD6B9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8662AAE6-3C70-42C7-9FD0-AB204DFD6B9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8662AAE6-3C70-42C7-9FD0-AB204DFD6B9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8662AAE6-3C70-42C7-9FD0-AB204DFD6B9C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA30D375-A8AB-41D1-9936-D48A3F0D0B48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA30D375-A8AB-41D1-9936-D48A3F0D0B48}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA30D375-A8AB-41D1-9936-D48A3F0D0B48}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA30D375-A8AB-41D1-9936-D48A3F0D0B48}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36F25033-47B0-42CC-9AD3-90371FEFB061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36F25033-47B0-42CC-9AD3-90371FEFB061}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36F25033-47B0-42CC-9AD3-90371FEFB061}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36F25033-47B0-42CC-9AD3-90371FEFB061}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE899E4A-F073-4E7E-B6F8-FE96696234BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE899E4A-F073-4E7E-B6F8-FE96696234BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE899E4A-F073-4E7E-B6F8-FE96696234BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE899E4A-F073-4E7E-B6F8-FE96696234BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8611AAFC-7370-48DA-AC22-3D0766B6B1FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8611AAFC-7370-48DA-AC22-3D0766B6B1FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8611AAFC-7370-48DA-AC22-3D0766B6B1FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8611AAFC-7370-48DA-AC22-3D0766B6B1FF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -123,6 +161,14 @@ Global
 		{9CA3FA95-F36D-457B-BA7C-5D1F94A4C7B9} = {4F17E201-98A0-44A6-8B34-BF3A4B5B5EA8}
 		{FA37050B-F735-43A3-A1AF-94BC06D88E1A} = {4F17E201-98A0-44A6-8B34-BF3A4B5B5EA8}
 		{1E5E7A69-E4B6-44ED-BABB-327C2F32830B} = {4F17E201-98A0-44A6-8B34-BF3A4B5B5EA8}
+		{8662AAE6-3C70-42C7-9FD0-AB204DFD6B9C} = {71027792-71B9-4E55-BCF3-88B01F6957CB}
+		{DA30D375-A8AB-41D1-9936-D48A3F0D0B48} = {71027792-71B9-4E55-BCF3-88B01F6957CB}
+		{71027792-71B9-4E55-BCF3-88B01F6957CB} = {89602401-88D0-4FE4-B2EF-257C5C536791}
+		{36F25033-47B0-42CC-9AD3-90371FEFB061} = {757768C3-A60E-433B-A657-00BABF61A537}
+		{EE899E4A-F073-4E7E-B6F8-FE96696234BE} = {757768C3-A60E-433B-A657-00BABF61A537}
+		{757768C3-A60E-433B-A657-00BABF61A537} = {89602401-88D0-4FE4-B2EF-257C5C536791}
+		{8611AAFC-7370-48DA-AC22-3D0766B6B1FF} = {4A293856-6920-4843-AC64-8296E7B7389C}
+		{4A293856-6920-4843-AC64-8296E7B7389C} = {89602401-88D0-4FE4-B2EF-257C5C536791}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5551E9B9-3000-4C32-AE97-0C3D30561263}
diff --git a/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln b/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
index f0d8c2efe13f5..a6d348a0919a2 100644
--- a/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
+++ b/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
@@ -3,6 +3,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", ".
 EndProject
 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.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{A4D49082-19F6-4402-AF2B-7C3074C175C0}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj", "{A26E9B9C-AFE7-4740-AC73-626D9823E515}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "..\System.Collections.NonGeneric\src\System.Collections.NonGeneric.csproj", "{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}"
@@ -47,8 +49,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", ".
 EndProject
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2F5DA438-6CBA-42AA-818A-64C633A56D55}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{A17B970B-41B2-4C78-BA05-2B954357E46A}"
@@ -73,14 +73,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{7492A8FA-F70F-4B7F-8514-8C9B7BE6D4CA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{315BC231-270B-456C-919A-3E9BB50CDD7A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{0759C204-5299-4E4E-BE2A-4579073BF610}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A634ABF4-A81F-4FA7-B35D-152B670045BC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{DFFC308C-63D3-45CC-A904-5AC273DD82C8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6BA02609-AE23-4E80-8B4B-9C6548AA147A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{315BC231-270B-456C-919A-3E9BB50CDD7A}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1826CD8D-A5E3-4C8E-A49A-E746D9682B87}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BDABB39C-A9FF-4A9B-8BA2-EF873C5EEB16}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{85C7EB8C-C328-4212-90E1-4B0EAB0ED429}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{0691D988-6FCE-4D84-A632-3A27C42690CD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{3AA3AAFF-B75A-499C-9716-9DC925F4712E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{C4ACB0FD-4BAD-4196-9FA5-1A32B7662955}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -151,6 +171,27 @@ Global
 		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Checked|arm64.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
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Debug|x64.Build.0 = Debug|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Debug|x86.Build.0 = Debug|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Release|arm.ActiveCfg = Release|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Release|x64.ActiveCfg = Release|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Release|x64.Build.0 = Release|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Release|x86.ActiveCfg = Release|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Release|x86.Build.0 = Release|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{A26E9B9C-AFE7-4740-AC73-626D9823E515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A26E9B9C-AFE7-4740-AC73-626D9823E515}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A26E9B9C-AFE7-4740-AC73-626D9823E515}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -613,27 +654,6 @@ Global
 		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Checked|arm64.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
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Debug|arm.ActiveCfg = Debug|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Debug|x64.Build.0 = Debug|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Debug|x86.Build.0 = Debug|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Release|arm.ActiveCfg = Release|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Release|x64.ActiveCfg = Release|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Release|x64.Build.0 = Release|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Release|x86.ActiveCfg = Release|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Release|x86.Build.0 = Release|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{2F5DA438-6CBA-42AA-818A-64C633A56D55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2F5DA438-6CBA-42AA-818A-64C633A56D55}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2F5DA438-6CBA-42AA-818A-64C633A56D55}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -886,12 +906,121 @@ Global
 		{7492A8FA-F70F-4B7F-8514-8C9B7BE6D4CA}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{7492A8FA-F70F-4B7F-8514-8C9B7BE6D4CA}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{7492A8FA-F70F-4B7F-8514-8C9B7BE6D4CA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Debug|x64.Build.0 = Debug|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Debug|x86.Build.0 = Debug|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Release|arm.ActiveCfg = Release|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Release|x64.ActiveCfg = Release|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Release|x64.Build.0 = Release|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Release|x86.ActiveCfg = Release|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Release|x86.Build.0 = Release|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Debug|x64.Build.0 = Debug|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Debug|x86.Build.0 = Debug|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Release|arm.ActiveCfg = Release|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Release|x64.ActiveCfg = Release|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Release|x64.Build.0 = Release|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Release|x86.ActiveCfg = Release|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Release|x86.Build.0 = Release|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Debug|x64.Build.0 = Debug|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Debug|x86.Build.0 = Debug|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Release|arm.ActiveCfg = Release|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Release|arm64.ActiveCfg = Release|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Release|x64.ActiveCfg = Release|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Release|x64.Build.0 = Release|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Release|x86.ActiveCfg = Release|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Release|x86.Build.0 = Release|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0759C204-5299-4E4E-BE2A-4579073BF610}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Debug|x64.Build.0 = Debug|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Debug|x86.Build.0 = Debug|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Release|arm.ActiveCfg = Release|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Release|x64.ActiveCfg = Release|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Release|x64.Build.0 = Release|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Release|x86.ActiveCfg = Release|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Release|x86.Build.0 = Release|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Debug|x64.Build.0 = Debug|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Debug|x86.Build.0 = Debug|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Release|arm.ActiveCfg = Release|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Release|x64.ActiveCfg = Release|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Release|x64.Build.0 = Release|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Release|x86.ActiveCfg = Release|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Release|x86.Build.0 = Release|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73} = {315BC231-270B-456C-919A-3E9BB50CDD7A}
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73} = {DFFC308C-63D3-45CC-A904-5AC273DD82C8}
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A}
+		{422C9340-E720-4554-B6AC-560A19FE16B1} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A}
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A}
+		{A4D49082-19F6-4402-AF2B-7C3074C175C0} = {315BC231-270B-456C-919A-3E9BB50CDD7A}
 		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86} = {315BC231-270B-456C-919A-3E9BB50CDD7A}
 		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4} = {315BC231-270B-456C-919A-3E9BB50CDD7A}
 		{95F843FE-38B4-4ED5-81FF-605DE38155F6} = {315BC231-270B-456C-919A-3E9BB50CDD7A}
@@ -906,9 +1035,6 @@ Global
 		{51055F1B-B97E-46DE-8D94-9EB885D22D20} = {315BC231-270B-456C-919A-3E9BB50CDD7A}
 		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB} = {315BC231-270B-456C-919A-3E9BB50CDD7A}
 		{7492A8FA-F70F-4B7F-8514-8C9B7BE6D4CA} = {315BC231-270B-456C-919A-3E9BB50CDD7A}
-		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A}
-		{422C9340-E720-4554-B6AC-560A19FE16B1} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A}
-		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A}
 		{A26E9B9C-AFE7-4740-AC73-626D9823E515} = {1826CD8D-A5E3-4C8E-A49A-E746D9682B87}
 		{51AEBD0E-0A93-4532-A010-CAAF8E320D6C} = {1826CD8D-A5E3-4C8E-A49A-E746D9682B87}
 		{279066F9-4DB9-4897-8CE4-66BC31118323} = {1826CD8D-A5E3-4C8E-A49A-E746D9682B87}
@@ -925,9 +1051,16 @@ Global
 		{7D404296-72F5-4F99-931F-73791FAB3E14} = {1826CD8D-A5E3-4C8E-A49A-E746D9682B87}
 		{8D689F55-88E3-4EF3-9554-9230409A63FB} = {1826CD8D-A5E3-4C8E-A49A-E746D9682B87}
 		{8EAD8906-AF4E-42CA-983E-28CFE2224AEE} = {BDABB39C-A9FF-4A9B-8BA2-EF873C5EEB16}
-		{4E28CDB1-4EB1-4A66-A074-5BC680E7A898} = {BDABB39C-A9FF-4A9B-8BA2-EF873C5EEB16}
 		{2F5DA438-6CBA-42AA-818A-64C633A56D55} = {BDABB39C-A9FF-4A9B-8BA2-EF873C5EEB16}
 		{A17B970B-41B2-4C78-BA05-2B954357E46A} = {BDABB39C-A9FF-4A9B-8BA2-EF873C5EEB16}
+		{1F63C04C-C7DE-46AF-8430-36C3EAE5F222} = {85C7EB8C-C328-4212-90E1-4B0EAB0ED429}
+		{DF13E75E-A0FA-4AB2-85DF-A1CFB43B3CDA} = {85C7EB8C-C328-4212-90E1-4B0EAB0ED429}
+		{85C7EB8C-C328-4212-90E1-4B0EAB0ED429} = {C4ACB0FD-4BAD-4196-9FA5-1A32B7662955}
+		{0759C204-5299-4E4E-BE2A-4579073BF610} = {0691D988-6FCE-4D84-A632-3A27C42690CD}
+		{C1639BF7-5C1A-4D34-A3B0-093E7DE09EA6} = {0691D988-6FCE-4D84-A632-3A27C42690CD}
+		{0691D988-6FCE-4D84-A632-3A27C42690CD} = {C4ACB0FD-4BAD-4196-9FA5-1A32B7662955}
+		{A634ABF4-A81F-4FA7-B35D-152B670045BC} = {3AA3AAFF-B75A-499C-9716-9DC925F4712E}
+		{3AA3AAFF-B75A-499C-9716-9DC925F4712E} = {C4ACB0FD-4BAD-4196-9FA5-1A32B7662955}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {52B54BB6-271E-45BD-A7A4-D4CEDC973704}
diff --git a/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln b/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
index d24c074486efd..e7145687e3a11 100644
--- a/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
+++ b/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
@@ -19,14 +19,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{58E24DB7-4207-49F8-BC73-A665A2A961A6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{269A342C-D693-495C-8A07-11E08C881F6B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{F0C042E4-53F3-4661-93DA-D9223C2A650B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{23BBB442-219F-4032-A2E6-B8924F5DBB53}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{2A358873-B1A4-4FA5-B78C-4143813B1198}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{D0B0634C-A5CB-44CC-9C73-C2A402115C76}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{4902CFA5-3299-42C3-8171-7E809C83CAEC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{004D5B4C-87B3-4499-9638-1B317B762BEF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{21E11D21-3706-49C7-ACA7-10BA9A021908}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{61AC03AE-7090-458C-A3AB-5A4CCFF6AD08}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{269A342C-D693-495C-8A07-11E08C881F6B}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F2FD3769-35C6-481A-AF35-9BDDEE550B54}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{E44548BC-2CFB-47A3-B98A-1D5754ADCFA7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{B942EA94-8688-414B-A68F-5CEAE6C6F627}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{966D1480-601D-4A4A-8038-DA0C6BDF67EA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{05ABD50D-0E79-49C9-B6CB-0FEDCADA9085}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -265,21 +285,134 @@ Global
 		{58E24DB7-4207-49F8-BC73-A665A2A961A6}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{58E24DB7-4207-49F8-BC73-A665A2A961A6}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{58E24DB7-4207-49F8-BC73-A665A2A961A6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Debug|x64.Build.0 = Debug|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Debug|x86.Build.0 = Debug|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Release|arm.ActiveCfg = Release|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Release|x64.ActiveCfg = Release|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Release|x64.Build.0 = Release|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Release|x86.ActiveCfg = Release|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Release|x86.Build.0 = Release|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Debug|x64.Build.0 = Debug|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Debug|x86.Build.0 = Debug|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Release|arm.ActiveCfg = Release|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Release|arm64.ActiveCfg = Release|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Release|x64.ActiveCfg = Release|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Release|x64.Build.0 = Release|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Release|x86.ActiveCfg = Release|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Release|x86.Build.0 = Release|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Debug|x64.Build.0 = Debug|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Debug|x86.Build.0 = Debug|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Release|arm.ActiveCfg = Release|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Release|x64.ActiveCfg = Release|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Release|x64.Build.0 = Release|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Release|x86.ActiveCfg = Release|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Release|x86.Build.0 = Release|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2A358873-B1A4-4FA5-B78C-4143813B1198}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Debug|x64.Build.0 = Debug|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Debug|x86.Build.0 = Debug|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Release|arm.ActiveCfg = Release|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Release|x64.ActiveCfg = Release|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Release|x64.Build.0 = Release|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Release|x86.ActiveCfg = Release|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Release|x86.Build.0 = Release|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Debug|x64.Build.0 = Debug|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Debug|x86.Build.0 = Debug|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Release|arm.ActiveCfg = Release|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Release|x64.ActiveCfg = Release|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Release|x64.Build.0 = Release|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Release|x86.ActiveCfg = Release|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Release|x86.Build.0 = Release|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{370DCE61-CBDF-466E-91DB-5AE622BF2E52} = {269A342C-D693-495C-8A07-11E08C881F6B}
-		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E} = {269A342C-D693-495C-8A07-11E08C881F6B}
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52} = {004D5B4C-87B3-4499-9638-1B317B762BEF}
 		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168} = {21E11D21-3706-49C7-ACA7-10BA9A021908}
 		{24605C4D-2465-433D-A393-45CB950E0834} = {21E11D21-3706-49C7-ACA7-10BA9A021908}
 		{D7C16DED-127A-4CBB-BBCF-DF133816413B} = {61AC03AE-7090-458C-A3AB-5A4CCFF6AD08}
 		{79F03506-0B08-46BB-B99D-ABDBA8CFFFAC} = {61AC03AE-7090-458C-A3AB-5A4CCFF6AD08}
 		{58E24DB7-4207-49F8-BC73-A665A2A961A6} = {61AC03AE-7090-458C-A3AB-5A4CCFF6AD08}
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E} = {269A342C-D693-495C-8A07-11E08C881F6B}
 		{3969DA9E-6C7D-421D-ABCC-BD02DFA36DA4} = {F2FD3769-35C6-481A-AF35-9BDDEE550B54}
 		{7D67652E-7840-42AF-A830-F9A336AD8CBE} = {F2FD3769-35C6-481A-AF35-9BDDEE550B54}
 		{38416350-0E7B-4201-8B7E-3FA80FCFA81A} = {F2FD3769-35C6-481A-AF35-9BDDEE550B54}
+		{F0C042E4-53F3-4661-93DA-D9223C2A650B} = {E44548BC-2CFB-47A3-B98A-1D5754ADCFA7}
+		{23BBB442-219F-4032-A2E6-B8924F5DBB53} = {E44548BC-2CFB-47A3-B98A-1D5754ADCFA7}
+		{E44548BC-2CFB-47A3-B98A-1D5754ADCFA7} = {05ABD50D-0E79-49C9-B6CB-0FEDCADA9085}
+		{2A358873-B1A4-4FA5-B78C-4143813B1198} = {B942EA94-8688-414B-A68F-5CEAE6C6F627}
+		{D0B0634C-A5CB-44CC-9C73-C2A402115C76} = {B942EA94-8688-414B-A68F-5CEAE6C6F627}
+		{B942EA94-8688-414B-A68F-5CEAE6C6F627} = {05ABD50D-0E79-49C9-B6CB-0FEDCADA9085}
+		{4902CFA5-3299-42C3-8171-7E809C83CAEC} = {966D1480-601D-4A4A-8038-DA0C6BDF67EA}
+		{966D1480-601D-4A4A-8038-DA0C6BDF67EA} = {05ABD50D-0E79-49C9-B6CB-0FEDCADA9085}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5AB76D2F-E758-4FA1-83E4-E5645849CC34}
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln b/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
index a79b3b8dbbf1c..da0db7405e86b 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
+++ b/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
@@ -1,6 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{3F896EC8-24DC-453E-A937-8AC663EE2AB2}"
+EndProject
 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.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\ref\System.Configuration.ConfigurationManager.csproj", "{33637A81-A335-474A-814D-648881BB403B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj", "{A62FC401-7B8B-4CDE-8D46-3776980C94F0}"
@@ -25,12 +29,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices",
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{C7F62EB6-E16F-4A1F-A840-C8812BB69C53}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{6EFBC637-BE12-4544-9E21-CAACBA07C68B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{052330E1-08F5-4AC3-987D-4C601D640414}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{C741194C-DFF2-4B16-824B-29CFD021097C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{47B3305D-FAA0-4008-A82D-107D66154032}"
+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}"
@@ -43,135 +55,796 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DE91E835-DB5D-4FAD-B992-1A98B24B87E9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{6FBAC850-1A4D-4906-B24D-EF89EB925152}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{945D5BB6-FB9B-4489-816A-7B4E97843CF8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{34998B2E-86EF-4DB2-BBD1-442F5FD0D83D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DE91E835-DB5D-4FAD-B992-1A98B24B87E9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C2159C53-1E91-486D-A66C-E658FB73A87F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CBDB0A5C-FDD0-4B00-8840-D40E4D6B17DB}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{BD4D4F5A-FF81-4994-80EB-A1B05E553822}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{085B386F-7916-4A74-BED4-DCDA37AB91F9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{E60386BE-4696-4126-884F-D202770ECF60}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0C80CE34-037A-496E-BE3D-91108B0A988B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm = Debug|arm
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm = Release|arm
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Debug|Any CPU.Build.0 = Debug|x64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Debug|arm.ActiveCfg = Debug|arm
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Debug|arm.Build.0 = Debug|arm
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Debug|arm64.ActiveCfg = Debug|arm64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Debug|arm64.Build.0 = Debug|arm64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Debug|x64.ActiveCfg = Debug|x64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Debug|x64.Build.0 = Debug|x64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Debug|x86.ActiveCfg = Debug|x86
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Debug|x86.Build.0 = Debug|x86
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Release|Any CPU.ActiveCfg = Release|x64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Release|Any CPU.Build.0 = Release|x64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Release|arm.ActiveCfg = Release|arm
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Release|arm.Build.0 = Release|arm
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Release|arm64.ActiveCfg = Release|arm64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Release|arm64.Build.0 = Release|arm64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Release|x64.ActiveCfg = Release|x64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Release|x64.Build.0 = Release|x64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Release|x86.ActiveCfg = Release|x86
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Release|x86.Build.0 = Release|x86
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Checked|Any CPU.Build.0 = Checked|x64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Checked|arm.ActiveCfg = Checked|arm
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Checked|arm.Build.0 = Checked|arm
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Checked|arm64.ActiveCfg = Checked|arm64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Checked|arm64.Build.0 = Checked|arm64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Checked|x64.ActiveCfg = Checked|x64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Checked|x64.Build.0 = Checked|x64
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Checked|x86.ActiveCfg = Checked|x86
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2}.Checked|x86.Build.0 = Checked|x86
 		{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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Debug|x64.Build.0 = Debug|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Debug|x86.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
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Release|arm.ActiveCfg = Release|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Release|arm64.ActiveCfg = Release|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Release|x64.ActiveCfg = Release|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Release|x64.Build.0 = Release|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Release|x86.ActiveCfg = Release|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Release|x86.Build.0 = Release|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Debug|x64.Build.0 = Debug|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Debug|x86.Build.0 = Debug|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Release|arm.ActiveCfg = Release|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Release|arm64.ActiveCfg = Release|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Release|x64.ActiveCfg = Release|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Release|x64.Build.0 = Release|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Release|x86.ActiveCfg = Release|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Release|x86.Build.0 = Release|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Debug|x64.Build.0 = Debug|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Debug|x86.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
+		{33637A81-A335-474A-814D-648881BB403B}.Release|arm.ActiveCfg = Release|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Release|x64.ActiveCfg = Release|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Release|x64.Build.0 = Release|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Release|x86.ActiveCfg = Release|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Release|x86.Build.0 = Release|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Debug|x64.Build.0 = Debug|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Debug|x86.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
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Release|arm.ActiveCfg = Release|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Release|x64.ActiveCfg = Release|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Release|x64.Build.0 = Release|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Release|x86.ActiveCfg = Release|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Release|x86.Build.0 = Release|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Debug|x64.Build.0 = Debug|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Debug|x86.Build.0 = Debug|Any CPU
 		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Release|arm.ActiveCfg = Release|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Release|x64.ActiveCfg = Release|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Release|x64.Build.0 = Release|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Release|x86.ActiveCfg = Release|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Release|x86.Build.0 = Release|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{82747414-420A-47A9-886A-A042E46780B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{82747414-420A-47A9-886A-A042E46780B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Debug|x64.Build.0 = Debug|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Debug|x86.Build.0 = Debug|Any CPU
 		{82747414-420A-47A9-886A-A042E46780B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{82747414-420A-47A9-886A-A042E46780B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Release|arm.ActiveCfg = Release|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Release|x64.ActiveCfg = Release|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Release|x64.Build.0 = Release|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Release|x86.ActiveCfg = Release|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Release|x86.Build.0 = Release|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{82747414-420A-47A9-886A-A042E46780B6}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Debug|x64.Build.0 = Debug|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Debug|x86.Build.0 = Debug|Any CPU
 		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Release|arm.ActiveCfg = Release|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Release|arm64.ActiveCfg = Release|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Release|x64.ActiveCfg = Release|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Release|x64.Build.0 = Release|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Release|x86.ActiveCfg = Release|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Release|x86.Build.0 = Release|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Debug|x64.Build.0 = Debug|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Debug|x86.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
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Release|arm.ActiveCfg = Release|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Release|x64.ActiveCfg = Release|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Release|x64.Build.0 = Release|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Release|x86.ActiveCfg = Release|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Release|x86.Build.0 = Release|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Debug|x64.Build.0 = Debug|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Debug|x86.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
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Release|arm.ActiveCfg = Release|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Release|x64.ActiveCfg = Release|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Release|x64.Build.0 = Release|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Release|x86.ActiveCfg = Release|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Release|x86.Build.0 = Release|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Debug|x64.Build.0 = Debug|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Debug|x86.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
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Release|arm.ActiveCfg = Release|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Release|arm64.ActiveCfg = Release|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Release|x64.ActiveCfg = Release|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Release|x64.Build.0 = Release|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Release|x86.ActiveCfg = Release|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Release|x86.Build.0 = Release|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Debug|x64.Build.0 = Debug|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Debug|x86.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
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Release|arm.ActiveCfg = Release|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Release|arm64.ActiveCfg = Release|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Release|x64.ActiveCfg = Release|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Release|x64.Build.0 = Release|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Release|x86.ActiveCfg = Release|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Release|x86.Build.0 = Release|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Debug|x64.Build.0 = Debug|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Debug|x86.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
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Release|arm.ActiveCfg = Release|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Release|x64.ActiveCfg = Release|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Release|x64.Build.0 = Release|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Release|x86.ActiveCfg = Release|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Release|x86.Build.0 = Release|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Debug|x64.Build.0 = Debug|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Debug|x86.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
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Release|arm.ActiveCfg = Release|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Release|x64.ActiveCfg = Release|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Release|x64.Build.0 = Release|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Release|x86.ActiveCfg = Release|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Release|x86.Build.0 = Release|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Debug|x64.Build.0 = Debug|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Debug|x86.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
-		{C7F62EB6-E16F-4A1F-A840-C8812BB69C53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7F62EB6-E16F-4A1F-A840-C8812BB69C53}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7F62EB6-E16F-4A1F-A840-C8812BB69C53}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7F62EB6-E16F-4A1F-A840-C8812BB69C53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Release|arm.ActiveCfg = Release|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Release|x64.ActiveCfg = Release|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Release|x64.Build.0 = Release|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Release|x86.ActiveCfg = Release|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Release|x86.Build.0 = Release|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Debug|x64.Build.0 = Debug|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Debug|x86.Build.0 = Debug|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Release|arm.ActiveCfg = Release|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Release|arm64.ActiveCfg = Release|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Release|x64.ActiveCfg = Release|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Release|x64.Build.0 = Release|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Release|x86.ActiveCfg = Release|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Release|x86.Build.0 = Release|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Debug|x64.Build.0 = Debug|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Debug|x86.Build.0 = Debug|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Release|arm.ActiveCfg = Release|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Release|x64.ActiveCfg = Release|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Release|x64.Build.0 = Release|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Release|x86.ActiveCfg = Release|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Release|x86.Build.0 = Release|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Debug|x64.Build.0 = Debug|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Debug|x86.Build.0 = Debug|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Release|arm.ActiveCfg = Release|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Release|x64.ActiveCfg = Release|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Release|x64.Build.0 = Release|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Release|x86.ActiveCfg = Release|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Release|x86.Build.0 = Release|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Debug|x64.Build.0 = Debug|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Debug|x86.Build.0 = Debug|Any CPU
 		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Release|arm.ActiveCfg = Release|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Release|x64.ActiveCfg = Release|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Release|x64.Build.0 = Release|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Release|x86.ActiveCfg = Release|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Release|x86.Build.0 = Release|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{052330E1-08F5-4AC3-987D-4C601D640414}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{052330E1-08F5-4AC3-987D-4C601D640414}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Debug|x64.Build.0 = Debug|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Debug|x86.Build.0 = Debug|Any CPU
 		{052330E1-08F5-4AC3-987D-4C601D640414}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{052330E1-08F5-4AC3-987D-4C601D640414}.Release|Any CPU.Build.0 = Release|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Release|arm.ActiveCfg = Release|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Release|arm64.ActiveCfg = Release|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Release|x64.ActiveCfg = Release|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Release|x64.Build.0 = Release|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Release|x86.ActiveCfg = Release|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Release|x86.Build.0 = Release|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{052330E1-08F5-4AC3-987D-4C601D640414}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Debug|x64.Build.0 = Debug|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Debug|x86.Build.0 = Debug|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Release|arm.ActiveCfg = Release|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Release|x64.ActiveCfg = Release|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Release|x64.Build.0 = Release|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Release|x86.ActiveCfg = Release|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Release|x86.Build.0 = Release|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C741194C-DFF2-4B16-824B-29CFD021097C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Debug|x64.Build.0 = Debug|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Debug|x86.Build.0 = Debug|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Release|arm.ActiveCfg = Release|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Release|arm64.ActiveCfg = Release|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Release|x64.ActiveCfg = Release|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Release|x64.Build.0 = Release|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Release|x86.ActiveCfg = Release|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Release|x86.Build.0 = Release|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{47B3305D-FAA0-4008-A82D-107D66154032}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Debug|x64.Build.0 = Debug|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Debug|x86.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
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Release|arm.ActiveCfg = Release|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Release|x64.ActiveCfg = Release|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Release|x64.Build.0 = Release|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Release|x86.ActiveCfg = Release|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Release|x86.Build.0 = Release|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Debug|x64.Build.0 = Debug|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Debug|x86.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
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Release|arm.ActiveCfg = Release|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Release|x64.ActiveCfg = Release|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Release|x64.Build.0 = Release|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Release|x86.ActiveCfg = Release|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Release|x86.Build.0 = Release|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Debug|x64.Build.0 = Debug|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Debug|x86.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
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Release|arm.ActiveCfg = Release|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Release|arm64.ActiveCfg = Release|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Release|x64.ActiveCfg = Release|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Release|x64.Build.0 = Release|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Release|x86.ActiveCfg = Release|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Release|x86.Build.0 = Release|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Debug|x64.Build.0 = Debug|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Debug|x86.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
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Release|arm.ActiveCfg = Release|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Release|x64.ActiveCfg = Release|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Release|x64.Build.0 = Release|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Release|x86.ActiveCfg = Release|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Release|x86.Build.0 = Release|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Debug|x64.Build.0 = Debug|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Debug|x86.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
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Release|arm.ActiveCfg = Release|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Release|x64.ActiveCfg = Release|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Release|x64.Build.0 = Release|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Release|x86.ActiveCfg = Release|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Release|x86.Build.0 = Release|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Debug|x64.Build.0 = Debug|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Debug|x86.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
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Release|arm.ActiveCfg = Release|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Release|x64.ActiveCfg = Release|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Release|x64.Build.0 = Release|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Release|x86.ActiveCfg = Release|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Release|x86.Build.0 = Release|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Debug|x64.Build.0 = Debug|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Debug|x86.Build.0 = Debug|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Release|arm.ActiveCfg = Release|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Release|x64.ActiveCfg = Release|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Release|x64.Build.0 = Release|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Release|x86.ActiveCfg = Release|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Release|x86.Build.0 = Release|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Debug|x64.Build.0 = Debug|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Debug|x86.Build.0 = Debug|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Release|arm.ActiveCfg = Release|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Release|arm64.ActiveCfg = Release|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Release|x64.ActiveCfg = Release|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Release|x64.Build.0 = Release|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Release|x86.ActiveCfg = Release|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Release|x86.Build.0 = Release|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Debug|x64.Build.0 = Debug|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Debug|x86.Build.0 = Debug|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Release|arm.ActiveCfg = Release|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Release|x64.ActiveCfg = Release|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Release|x64.Build.0 = Release|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Release|x86.ActiveCfg = Release|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Release|x86.Build.0 = Release|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Debug|x64.Build.0 = Debug|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Debug|x86.Build.0 = Debug|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Release|arm.ActiveCfg = Release|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Release|x64.ActiveCfg = Release|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Release|x64.Build.0 = Release|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Release|x86.ActiveCfg = Release|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Release|x86.Build.0 = Release|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Debug|x64.Build.0 = Debug|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Debug|x86.Build.0 = Debug|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Release|arm.ActiveCfg = Release|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Release|x64.ActiveCfg = Release|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Release|x64.Build.0 = Release|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Release|x86.ActiveCfg = Release|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Release|x86.Build.0 = Release|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{3F896EC8-24DC-453E-A937-8AC663EE2AB2} = {34998B2E-86EF-4DB2-BBD1-442F5FD0D83D}
 		{05604AC6-E1DA-460E-9A38-57EB19BE3327} = {DE91E835-DB5D-4FAD-B992-1A98B24B87E9}
 		{44080626-DF98-470B-BCA1-CC3DFFCB94E3} = {DE91E835-DB5D-4FAD-B992-1A98B24B87E9}
-		{33637A81-A335-474A-814D-648881BB403B} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
-		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
-		{7BC4C9CF-F8E4-424B-9F30-237B801F435D} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
-		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
-		{8D48B49B-398F-4536-B436-AAD50A7F54B1} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
-		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
-		{10F92CA0-8897-420A-9963-F46BC1274D28} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
-		{CDF9EADE-78CA-4775-8961-D52E066432C9} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
+		{516999D7-BFBD-41D1-A96C-69EBCDB6CF64} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
 		{A62FC401-7B8B-4CDE-8D46-3776980C94F0} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
 		{82747414-420A-47A9-886A-A042E46780B6} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
 		{EA3C3FD4-EE85-4F25-A787-12EECA3529B0} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
 		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
 		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
 		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
+		{12EE4F0D-57F9-48A4-835E-CE4B16DEF1F6} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
+		{47B3305D-FAA0-4008-A82D-107D66154032} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
 		{A6769C35-8C53-46BF-84AE-44C921C39BEA} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
 		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
 		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
-		{C7F62EB6-E16F-4A1F-A840-C8812BB69C53} = {CBDB0A5C-FDD0-4B00-8840-D40E4D6B17DB}
+		{33637A81-A335-474A-814D-648881BB403B} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
+		{8710F08A-F3C3-4E92-B0ED-E787C4523EC0} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
+		{6EFBC637-BE12-4544-9E21-CAACBA07C68B} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
+		{C741194C-DFF2-4B16-824B-29CFD021097C} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
+		{10F92CA0-8897-420A-9963-F46BC1274D28} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
+		{CDF9EADE-78CA-4775-8961-D52E066432C9} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}
+		{87EEC1DB-F423-49B7-BC50-7FFAF68EB099} = {CBDB0A5C-FDD0-4B00-8840-D40E4D6B17DB}
 		{083BBAF9-356A-4C4B-B928-EB2DAF8D251F} = {CBDB0A5C-FDD0-4B00-8840-D40E4D6B17DB}
 		{052330E1-08F5-4AC3-987D-4C601D640414} = {CBDB0A5C-FDD0-4B00-8840-D40E4D6B17DB}
+		{6FBAC850-1A4D-4906-B24D-EF89EB925152} = {BD4D4F5A-FF81-4994-80EB-A1B05E553822}
+		{FDBE164F-BCC1-47F4-BE02-14AD93E11E05} = {BD4D4F5A-FF81-4994-80EB-A1B05E553822}
+		{BD4D4F5A-FF81-4994-80EB-A1B05E553822} = {0C80CE34-037A-496E-BE3D-91108B0A988B}
+		{DE1E971B-BEE5-4184-B290-C9A8EF21BBB1} = {085B386F-7916-4A74-BED4-DCDA37AB91F9}
+		{DF045410-2A19-45A7-88DA-7FA5ECEAFF7A} = {085B386F-7916-4A74-BED4-DCDA37AB91F9}
+		{085B386F-7916-4A74-BED4-DCDA37AB91F9} = {0C80CE34-037A-496E-BE3D-91108B0A988B}
+		{945D5BB6-FB9B-4489-816A-7B4E97843CF8} = {E60386BE-4696-4126-884F-D202770ECF60}
+		{E60386BE-4696-4126-884F-D202770ECF60} = {0C80CE34-037A-496E-BE3D-91108B0A988B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {600939C3-C746-4C12-9FA6-82208BD6CD03}
diff --git a/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln b/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
index 9ac67fea9954d..93d0471fae67e 100644
--- a/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
+++ b/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
@@ -1,6 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}"
+EndProject
 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.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{7A9021C4-769A-4A19-9244-0F575D4E96AE}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "ref\System.DirectoryServices.Protocols.csproj", "{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "src\System.DirectoryServices.Protocols.csproj", "{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}"
@@ -11,12 +15,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices",
 EndProject
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{875B1171-C38D-4842-B3E7-2D4D685F292B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{A5D41312-C3C2-4153-AB58-EE8717C8D379}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}"
+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}"
@@ -25,90 +37,598 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{19B414C5-ACD0-4E78-B0A0-C698132F1988}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{58AD219B-7E2F-4587-9D50-8ED0E0F9CF6A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FF4142E3-375C-4658-A1FD-F4C895F7B7B5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{0E308EAA-6CC8-4302-B245-CA31B600BCA9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{3AC935C8-2FD6-4B40-96D8-FCF4D64E2524}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{58AD219B-7E2F-4587-9D50-8ED0E0F9CF6A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7D7459AB-75AF-4AEF-90CA-11FD253C2B1C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FF4142E3-375C-4658-A1FD-F4C895F7B7B5}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6BC70A1F-00D5-482D-9603-DD6C6E84AE4B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D969D172-A67B-4C3D-A79B-2B1E0EE05E22}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D25ECFF0-8A66-488A-AD69-5486D70DF226}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{5301EE66-474D-48DB-9510-A6D2C216EF27}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{27218DDE-108C-4ED2-B8D1-4D69BC012864}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm = Debug|arm
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm = Release|arm
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Debug|Any CPU.Build.0 = Debug|x64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Debug|arm.ActiveCfg = Debug|arm
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Debug|arm.Build.0 = Debug|arm
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Debug|arm64.ActiveCfg = Debug|arm64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Debug|arm64.Build.0 = Debug|arm64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Debug|x64.ActiveCfg = Debug|x64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Debug|x64.Build.0 = Debug|x64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Debug|x86.ActiveCfg = Debug|x86
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Debug|x86.Build.0 = Debug|x86
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Release|Any CPU.ActiveCfg = Release|x64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Release|Any CPU.Build.0 = Release|x64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Release|arm.ActiveCfg = Release|arm
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Release|arm.Build.0 = Release|arm
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Release|arm64.ActiveCfg = Release|arm64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Release|arm64.Build.0 = Release|arm64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Release|x64.ActiveCfg = Release|x64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Release|x64.Build.0 = Release|x64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Release|x86.ActiveCfg = Release|x86
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Release|x86.Build.0 = Release|x86
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Checked|Any CPU.Build.0 = Checked|x64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Checked|arm.ActiveCfg = Checked|arm
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Checked|arm.Build.0 = Checked|arm
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Checked|arm64.ActiveCfg = Checked|arm64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Checked|arm64.Build.0 = Checked|arm64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Checked|x64.ActiveCfg = Checked|x64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Checked|x64.Build.0 = Checked|x64
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Checked|x86.ActiveCfg = Checked|x86
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6}.Checked|x86.Build.0 = Checked|x86
 		{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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Debug|x64.Build.0 = Debug|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Debug|x86.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
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Release|arm.ActiveCfg = Release|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Release|arm64.ActiveCfg = Release|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Release|x64.ActiveCfg = Release|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Release|x64.Build.0 = Release|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Release|x86.ActiveCfg = Release|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Release|x86.Build.0 = Release|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Debug|x64.Build.0 = Debug|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Debug|x86.Build.0 = Debug|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Release|arm.ActiveCfg = Release|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Release|x64.ActiveCfg = Release|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Release|x64.Build.0 = Release|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Release|x86.ActiveCfg = Release|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Release|x86.Build.0 = Release|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Debug|x64.Build.0 = Debug|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Debug|x86.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
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Release|arm.ActiveCfg = Release|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Release|x64.ActiveCfg = Release|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Release|x64.Build.0 = Release|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Release|x86.ActiveCfg = Release|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Release|x86.Build.0 = Release|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Debug|x64.Build.0 = Debug|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Debug|x86.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
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Release|arm.ActiveCfg = Release|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Release|arm64.ActiveCfg = Release|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Release|x64.ActiveCfg = Release|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Release|x64.Build.0 = Release|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Release|x86.ActiveCfg = Release|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Release|x86.Build.0 = Release|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Debug|x64.Build.0 = Debug|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Debug|x86.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
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Release|arm.ActiveCfg = Release|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Release|arm64.ActiveCfg = Release|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Release|x64.ActiveCfg = Release|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Release|x64.Build.0 = Release|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Release|x86.ActiveCfg = Release|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Release|x86.Build.0 = Release|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Debug|x64.Build.0 = Debug|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Debug|x86.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
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Release|arm.ActiveCfg = Release|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Release|x64.ActiveCfg = Release|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Release|x64.Build.0 = Release|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Release|x86.ActiveCfg = Release|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Release|x86.Build.0 = Release|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Debug|x64.Build.0 = Debug|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Debug|x86.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
-		{875B1171-C38D-4842-B3E7-2D4D685F292B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{875B1171-C38D-4842-B3E7-2D4D685F292B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{875B1171-C38D-4842-B3E7-2D4D685F292B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{875B1171-C38D-4842-B3E7-2D4D685F292B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Release|arm.ActiveCfg = Release|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Release|x64.ActiveCfg = Release|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Release|x64.Build.0 = Release|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Release|x86.ActiveCfg = Release|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Release|x86.Build.0 = Release|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Debug|x64.Build.0 = Debug|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Debug|x86.Build.0 = Debug|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Release|arm.ActiveCfg = Release|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Release|x64.ActiveCfg = Release|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Release|x64.Build.0 = Release|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Release|x86.ActiveCfg = Release|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Release|x86.Build.0 = Release|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Debug|x64.Build.0 = Debug|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Debug|x86.Build.0 = Debug|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Release|arm.ActiveCfg = Release|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Release|x64.ActiveCfg = Release|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Release|x64.Build.0 = Release|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Release|x86.ActiveCfg = Release|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Release|x86.Build.0 = Release|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Debug|x64.Build.0 = Debug|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Debug|x86.Build.0 = Debug|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Release|arm.ActiveCfg = Release|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Release|x64.ActiveCfg = Release|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Release|x64.Build.0 = Release|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Release|x86.ActiveCfg = Release|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Release|x86.Build.0 = Release|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Debug|x64.Build.0 = Debug|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Debug|x86.Build.0 = Debug|Any CPU
 		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Release|arm.ActiveCfg = Release|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Release|x64.ActiveCfg = Release|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Release|x64.Build.0 = Release|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Release|x86.ActiveCfg = Release|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Release|x86.Build.0 = Release|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Debug|x64.Build.0 = Debug|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Debug|x86.Build.0 = Debug|Any CPU
 		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Release|arm.ActiveCfg = Release|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Release|x64.ActiveCfg = Release|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Release|x64.Build.0 = Release|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Release|x86.ActiveCfg = Release|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Release|x86.Build.0 = Release|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Debug|x64.Build.0 = Debug|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Debug|x86.Build.0 = Debug|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Release|Any CPU.Build.0 = Release|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Release|arm.ActiveCfg = Release|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Release|arm64.ActiveCfg = Release|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Release|x64.ActiveCfg = Release|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Release|x64.Build.0 = Release|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Release|x86.ActiveCfg = Release|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Release|x86.Build.0 = Release|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Debug|x64.Build.0 = Debug|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Debug|x86.Build.0 = Debug|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Release|arm.ActiveCfg = Release|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Release|x64.ActiveCfg = Release|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Release|x64.Build.0 = Release|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Release|x86.ActiveCfg = Release|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Release|x86.Build.0 = Release|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Debug|x64.Build.0 = Debug|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Debug|x86.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
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Release|arm.ActiveCfg = Release|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Release|arm64.ActiveCfg = Release|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Release|x64.ActiveCfg = Release|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Release|x64.Build.0 = Release|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Release|x86.ActiveCfg = Release|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Release|x86.Build.0 = Release|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Debug|x64.Build.0 = Debug|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Debug|x86.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
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Release|arm.ActiveCfg = Release|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Release|x64.ActiveCfg = Release|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Release|x64.Build.0 = Release|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Release|x86.ActiveCfg = Release|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Release|x86.Build.0 = Release|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Debug|x64.Build.0 = Debug|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Debug|x86.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
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Release|arm.ActiveCfg = Release|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Release|x64.ActiveCfg = Release|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Release|x64.Build.0 = Release|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Release|x86.ActiveCfg = Release|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Release|x86.Build.0 = Release|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Debug|x64.Build.0 = Debug|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Debug|x86.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
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Release|arm.ActiveCfg = Release|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Release|arm64.ActiveCfg = Release|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Release|x64.ActiveCfg = Release|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Release|x64.Build.0 = Release|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Release|x86.ActiveCfg = Release|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Release|x86.Build.0 = Release|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Debug|x64.Build.0 = Debug|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Debug|x86.Build.0 = Debug|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Release|arm.ActiveCfg = Release|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Release|arm64.ActiveCfg = Release|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Release|x64.ActiveCfg = Release|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Release|x64.Build.0 = Release|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Release|x86.ActiveCfg = Release|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Release|x86.Build.0 = Release|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Debug|x64.Build.0 = Debug|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Debug|x86.Build.0 = Debug|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Release|arm.ActiveCfg = Release|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Release|x64.ActiveCfg = Release|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Release|x64.Build.0 = Release|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Release|x86.ActiveCfg = Release|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Release|x86.Build.0 = Release|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Debug|x64.Build.0 = Debug|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Debug|x86.Build.0 = Debug|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Release|arm.ActiveCfg = Release|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Release|x64.ActiveCfg = Release|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Release|x64.Build.0 = Release|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Release|x86.ActiveCfg = Release|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Release|x86.Build.0 = Release|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Debug|x64.Build.0 = Debug|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Debug|x86.Build.0 = Debug|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Release|arm.ActiveCfg = Release|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Release|arm64.ActiveCfg = Release|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Release|x64.ActiveCfg = Release|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Release|x64.Build.0 = Release|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Release|x86.ActiveCfg = Release|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Release|x86.Build.0 = Release|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Debug|x64.Build.0 = Debug|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Debug|x86.Build.0 = Debug|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Release|arm.ActiveCfg = Release|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Release|x64.ActiveCfg = Release|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Release|x64.Build.0 = Release|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Release|x86.ActiveCfg = Release|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Release|x86.Build.0 = Release|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6} = {3AC935C8-2FD6-4B40-96D8-FCF4D64E2524}
 		{59D900EB-CABB-4CA9-9BE4-9855ADC32752} = {58AD219B-7E2F-4587-9D50-8ED0E0F9CF6A}
 		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0} = {58AD219B-7E2F-4587-9D50-8ED0E0F9CF6A}
-		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5}
-		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5}
-		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5}
-		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5}
+		{7A9021C4-769A-4A19-9244-0F575D4E96AE} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C}
 		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C}
 		{E1F18567-C282-456B-8CCC-677702609FAF} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C}
+		{6CCAD93E-1888-4610-8EB8-7043B7C61AE8} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C}
+		{E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C}
 		{167E89F1-63F0-4E47-B67E-9931589E75CE} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C}
 		{19B414C5-ACD0-4E78-B0A0-C698132F1988} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C}
-		{875B1171-C38D-4842-B3E7-2D4D685F292B} = {6BC70A1F-00D5-482D-9603-DD6C6E84AE4B}
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5}
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5}
+		{25243F48-E92B-4EA8-B1D2-7DE846C03AC5} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5}
+		{50734B6B-B918-4C3D-B6BB-3F38E2DE7169} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5}
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5}
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5}
+		{A5D41312-C3C2-4153-AB58-EE8717C8D379} = {6BC70A1F-00D5-482D-9603-DD6C6E84AE4B}
 		{2C3750CD-EEE9-4452-B901-AF3084E6B9B2} = {6BC70A1F-00D5-482D-9603-DD6C6E84AE4B}
 		{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5} = {6BC70A1F-00D5-482D-9603-DD6C6E84AE4B}
+		{28574109-6A9B-47FF-88A7-D5EEDB4B17C3} = {D969D172-A67B-4C3D-A79B-2B1E0EE05E22}
+		{7772368D-D8F9-428B-BA07-FE1C0BC3A3E5} = {D969D172-A67B-4C3D-A79B-2B1E0EE05E22}
+		{D969D172-A67B-4C3D-A79B-2B1E0EE05E22} = {27218DDE-108C-4ED2-B8D1-4D69BC012864}
+		{8A89CF04-DDA9-4BC6-89E6-44C7B871169B} = {D25ECFF0-8A66-488A-AD69-5486D70DF226}
+		{0E308EAA-6CC8-4302-B245-CA31B600BCA9} = {D25ECFF0-8A66-488A-AD69-5486D70DF226}
+		{D25ECFF0-8A66-488A-AD69-5486D70DF226} = {27218DDE-108C-4ED2-B8D1-4D69BC012864}
+		{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7} = {5301EE66-474D-48DB-9510-A6D2C216EF27}
+		{5301EE66-474D-48DB-9510-A6D2C216EF27} = {27218DDE-108C-4ED2-B8D1-4D69BC012864}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FA8DCCFE-EDCD-4086-AD0B-5089B54BC658}
diff --git a/src/libraries/System.DirectoryServices/System.DirectoryServices.sln b/src/libraries/System.DirectoryServices/System.DirectoryServices.sln
index aec33a65a9a3f..6bcbc7480b85b 100644
--- a/src/libraries/System.DirectoryServices/System.DirectoryServices.sln
+++ b/src/libraries/System.DirectoryServices/System.DirectoryServices.sln
@@ -1,18 +1,30 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{16140308-2197-4634-A664-3A73DA182FAE}"
+EndProject
 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.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "ref\System.DirectoryServices.csproj", "{DB7964E8-6761-47C7-B120-DAF13FDDE01B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "src\System.DirectoryServices.csproj", "{6870504E-8490-4A4C-938A-C68DA9A2F65D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Tests", "tests\System.DirectoryServices.Tests.csproj", "{197926DA-9180-4AD4-AC71-B95FC5CA7557}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{9DA2AD39-83D4-4500-A613-32039A21A3E3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{2929F1C6-A103-4211-A318-96EEE83DD713}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{843D7E6B-5F25-41C1-8469-764854BA2D86}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{8323FADF-3D4E-46EE-8CA8-45C523142B77}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{5AB39023-05D5-48A2-9414-C289ECB1C13B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{29CA2D73-E756-4A81-A0A3-733C771FB0AB}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}"
+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}"
@@ -21,80 +33,554 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{B3473ABA-A06B-445E-AE21-C7432AD14482}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EB30CC4C-9662-46E0-8BC5-DFC16A24365F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{15F34F54-7854-457C-BD9E-E65E14553832}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{902318E3-C881-4BB3-8EEA-FC24A836B5AE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{932D7BE3-67C5-40F9-BEF4-038C153405A2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{56F910A7-D120-4453-AF1D-594CF8398DC0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{9CC076AE-C3BC-4F17-8C01-E330D03F4657}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{3D6F1FD7-42FB-42BE-87D9-21202EC40845}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EB30CC4C-9662-46E0-8BC5-DFC16A24365F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{87FDB279-F475-45C0-92EF-7893E25AA0A6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{902318E3-C881-4BB3-8EEA-FC24A836B5AE}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C1A58B90-FE26-4840-9D69-60DFC77BF485}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0FD62E14-039A-4678-B5A2-00DAE2900BE3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D8D71BDD-8E82-496A-9F3A-66E035CDC6C5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{DE0D36D1-77BA-4FB6-A76A-A53C63634396}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{9AEB1879-A22A-46BD-B9B5-70348CE8F3CC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm = Debug|arm
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm = Release|arm
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{16140308-2197-4634-A664-3A73DA182FAE}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Debug|Any CPU.Build.0 = Debug|x64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Debug|arm.ActiveCfg = Debug|arm
+		{16140308-2197-4634-A664-3A73DA182FAE}.Debug|arm.Build.0 = Debug|arm
+		{16140308-2197-4634-A664-3A73DA182FAE}.Debug|arm64.ActiveCfg = Debug|arm64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Debug|arm64.Build.0 = Debug|arm64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Debug|x64.ActiveCfg = Debug|x64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Debug|x64.Build.0 = Debug|x64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Debug|x86.ActiveCfg = Debug|x86
+		{16140308-2197-4634-A664-3A73DA182FAE}.Debug|x86.Build.0 = Debug|x86
+		{16140308-2197-4634-A664-3A73DA182FAE}.Release|Any CPU.ActiveCfg = Release|x64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Release|Any CPU.Build.0 = Release|x64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Release|arm.ActiveCfg = Release|arm
+		{16140308-2197-4634-A664-3A73DA182FAE}.Release|arm.Build.0 = Release|arm
+		{16140308-2197-4634-A664-3A73DA182FAE}.Release|arm64.ActiveCfg = Release|arm64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Release|arm64.Build.0 = Release|arm64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Release|x64.ActiveCfg = Release|x64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Release|x64.Build.0 = Release|x64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Release|x86.ActiveCfg = Release|x86
+		{16140308-2197-4634-A664-3A73DA182FAE}.Release|x86.Build.0 = Release|x86
+		{16140308-2197-4634-A664-3A73DA182FAE}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Checked|Any CPU.Build.0 = Checked|x64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Checked|arm.ActiveCfg = Checked|arm
+		{16140308-2197-4634-A664-3A73DA182FAE}.Checked|arm.Build.0 = Checked|arm
+		{16140308-2197-4634-A664-3A73DA182FAE}.Checked|arm64.ActiveCfg = Checked|arm64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Checked|arm64.Build.0 = Checked|arm64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Checked|x64.ActiveCfg = Checked|x64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Checked|x64.Build.0 = Checked|x64
+		{16140308-2197-4634-A664-3A73DA182FAE}.Checked|x86.ActiveCfg = Checked|x86
+		{16140308-2197-4634-A664-3A73DA182FAE}.Checked|x86.Build.0 = Checked|x86
 		{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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Debug|x64.Build.0 = Debug|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Debug|x86.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
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Release|arm.ActiveCfg = Release|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Release|x64.ActiveCfg = Release|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Release|x64.Build.0 = Release|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Release|x86.ActiveCfg = Release|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Release|x86.Build.0 = Release|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Debug|x64.Build.0 = Debug|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Debug|x86.Build.0 = Debug|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Release|arm.ActiveCfg = Release|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Release|x64.ActiveCfg = Release|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Release|x64.Build.0 = Release|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Release|x86.ActiveCfg = Release|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Release|x86.Build.0 = Release|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Debug|x64.Build.0 = Debug|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Debug|x86.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
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Release|arm.ActiveCfg = Release|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Release|x64.ActiveCfg = Release|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Release|x64.Build.0 = Release|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Release|x86.ActiveCfg = Release|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Release|x86.Build.0 = Release|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Debug|x64.Build.0 = Debug|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Debug|x86.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
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Release|arm.ActiveCfg = Release|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Release|x64.ActiveCfg = Release|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Release|x64.Build.0 = Release|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Release|x86.ActiveCfg = Release|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Release|x86.Build.0 = Release|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Debug|x64.Build.0 = Debug|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Debug|x86.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
-		{9DA2AD39-83D4-4500-A613-32039A21A3E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DA2AD39-83D4-4500-A613-32039A21A3E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9DA2AD39-83D4-4500-A613-32039A21A3E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9DA2AD39-83D4-4500-A613-32039A21A3E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Release|arm.ActiveCfg = Release|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Release|arm64.ActiveCfg = Release|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Release|x64.ActiveCfg = Release|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Release|x64.Build.0 = Release|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Release|x86.ActiveCfg = Release|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Release|x86.Build.0 = Release|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Debug|x64.Build.0 = Debug|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Debug|x86.Build.0 = Debug|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Release|arm.ActiveCfg = Release|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Release|x64.ActiveCfg = Release|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Release|x64.Build.0 = Release|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Release|x86.ActiveCfg = Release|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Release|x86.Build.0 = Release|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2929F1C6-A103-4211-A318-96EEE83DD713}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Debug|x64.Build.0 = Debug|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Debug|x86.Build.0 = Debug|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Release|arm.ActiveCfg = Release|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Release|arm64.ActiveCfg = Release|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Release|x64.ActiveCfg = Release|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Release|x64.Build.0 = Release|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Release|x86.ActiveCfg = Release|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Release|x86.Build.0 = Release|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{843D7E6B-5F25-41C1-8469-764854BA2D86}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Debug|x64.Build.0 = Debug|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Debug|x86.Build.0 = Debug|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Release|arm.ActiveCfg = Release|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Release|x64.ActiveCfg = Release|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Release|x64.Build.0 = Release|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Release|x86.ActiveCfg = Release|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Release|x86.Build.0 = Release|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Debug|x64.Build.0 = Debug|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Debug|x86.Build.0 = Debug|Any CPU
 		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Release|arm.ActiveCfg = Release|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Release|x64.ActiveCfg = Release|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Release|x64.Build.0 = Release|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Release|x86.ActiveCfg = Release|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Release|x86.Build.0 = Release|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5AB39023-05D5-48A2-9414-C289ECB1C13B}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Debug|x64.Build.0 = Debug|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Debug|x86.Build.0 = Debug|Any CPU
 		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Release|arm.ActiveCfg = Release|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Release|arm64.ActiveCfg = Release|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Release|x64.ActiveCfg = Release|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Release|x64.Build.0 = Release|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Release|x86.ActiveCfg = Release|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Release|x86.Build.0 = Release|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Debug|x64.Build.0 = Debug|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Debug|x86.Build.0 = Debug|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Release|arm.ActiveCfg = Release|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Release|x64.ActiveCfg = Release|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Release|x64.Build.0 = Release|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Release|x86.ActiveCfg = Release|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Release|x86.Build.0 = Release|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Debug|x64.Build.0 = Debug|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Debug|x86.Build.0 = Debug|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Release|arm.ActiveCfg = Release|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Release|x64.ActiveCfg = Release|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Release|x64.Build.0 = Release|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Release|x86.ActiveCfg = Release|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Release|x86.Build.0 = Release|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Debug|x64.Build.0 = Debug|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Debug|x86.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
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Release|arm.ActiveCfg = Release|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Release|x64.ActiveCfg = Release|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Release|x64.Build.0 = Release|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Release|x86.ActiveCfg = Release|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Release|x86.Build.0 = Release|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Debug|x64.Build.0 = Debug|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Debug|x86.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
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Release|arm.ActiveCfg = Release|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Release|x64.ActiveCfg = Release|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Release|x64.Build.0 = Release|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Release|x86.ActiveCfg = Release|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Release|x86.Build.0 = Release|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Debug|x64.Build.0 = Debug|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Debug|x86.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
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Release|arm.ActiveCfg = Release|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Release|x64.ActiveCfg = Release|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Release|x64.Build.0 = Release|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Release|x86.ActiveCfg = Release|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Release|x86.Build.0 = Release|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Debug|x64.Build.0 = Debug|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Debug|x86.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
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Release|arm.ActiveCfg = Release|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Release|x64.ActiveCfg = Release|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Release|x64.Build.0 = Release|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Release|x86.ActiveCfg = Release|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Release|x86.Build.0 = Release|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Debug|x64.Build.0 = Debug|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Debug|x86.Build.0 = Debug|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Release|arm.ActiveCfg = Release|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Release|arm64.ActiveCfg = Release|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Release|x64.ActiveCfg = Release|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Release|x64.Build.0 = Release|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Release|x86.ActiveCfg = Release|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Release|x86.Build.0 = Release|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{15F34F54-7854-457C-BD9E-E65E14553832}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Debug|x64.Build.0 = Debug|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Debug|x86.Build.0 = Debug|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Release|arm.ActiveCfg = Release|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Release|arm64.ActiveCfg = Release|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Release|x64.ActiveCfg = Release|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Release|x64.Build.0 = Release|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Release|x86.ActiveCfg = Release|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Release|x86.Build.0 = Release|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Debug|x64.Build.0 = Debug|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Debug|x86.Build.0 = Debug|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Release|arm.ActiveCfg = Release|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Release|arm64.ActiveCfg = Release|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Release|x64.ActiveCfg = Release|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Release|x64.Build.0 = Release|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Release|x86.ActiveCfg = Release|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Release|x86.Build.0 = Release|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{56F910A7-D120-4453-AF1D-594CF8398DC0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Debug|x64.Build.0 = Debug|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Debug|x86.Build.0 = Debug|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Release|arm.ActiveCfg = Release|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Release|x64.ActiveCfg = Release|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Release|x64.Build.0 = Release|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Release|x86.ActiveCfg = Release|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Release|x86.Build.0 = Release|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Debug|x64.Build.0 = Debug|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Debug|x86.Build.0 = Debug|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Release|arm.ActiveCfg = Release|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Release|x64.ActiveCfg = Release|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Release|x64.Build.0 = Release|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Release|x86.ActiveCfg = Release|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Release|x86.Build.0 = Release|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{16140308-2197-4634-A664-3A73DA182FAE} = {3D6F1FD7-42FB-42BE-87D9-21202EC40845}
 		{1A19656D-1047-4E43-B9C5-73423399D1D4} = {EB30CC4C-9662-46E0-8BC5-DFC16A24365F}
 		{197926DA-9180-4AD4-AC71-B95FC5CA7557} = {EB30CC4C-9662-46E0-8BC5-DFC16A24365F}
-		{DB7964E8-6761-47C7-B120-DAF13FDDE01B} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE}
-		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE}
-		{169CCBAE-5490-4409-9CC7-48850ABA1BE8} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE}
+		{A0621F43-D8FF-4EDE-9165-1B2757F8AB14} = {87FDB279-F475-45C0-92EF-7893E25AA0A6}
 		{6870504E-8490-4A4C-938A-C68DA9A2F65D} = {87FDB279-F475-45C0-92EF-7893E25AA0A6}
+		{8323FADF-3D4E-46EE-8CA8-45C523142B77} = {87FDB279-F475-45C0-92EF-7893E25AA0A6}
+		{CBF80530-F3DF-4305-B45D-87F89D3FCBC5} = {87FDB279-F475-45C0-92EF-7893E25AA0A6}
 		{E2B0069E-C11C-4829-87C8-A98ED298CB8A} = {87FDB279-F475-45C0-92EF-7893E25AA0A6}
 		{B3473ABA-A06B-445E-AE21-C7432AD14482} = {87FDB279-F475-45C0-92EF-7893E25AA0A6}
-		{9DA2AD39-83D4-4500-A613-32039A21A3E3} = {C1A58B90-FE26-4840-9D69-60DFC77BF485}
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE}
+		{843D7E6B-5F25-41C1-8469-764854BA2D86} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE}
+		{3FFDE907-1181-40F7-AC06-F3AD3D029AAA} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE}
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE}
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE}
+		{2929F1C6-A103-4211-A318-96EEE83DD713} = {C1A58B90-FE26-4840-9D69-60DFC77BF485}
 		{5AB39023-05D5-48A2-9414-C289ECB1C13B} = {C1A58B90-FE26-4840-9D69-60DFC77BF485}
 		{29CA2D73-E756-4A81-A0A3-733C771FB0AB} = {C1A58B90-FE26-4840-9D69-60DFC77BF485}
+		{15F34F54-7854-457C-BD9E-E65E14553832} = {0FD62E14-039A-4678-B5A2-00DAE2900BE3}
+		{932D7BE3-67C5-40F9-BEF4-038C153405A2} = {0FD62E14-039A-4678-B5A2-00DAE2900BE3}
+		{0FD62E14-039A-4678-B5A2-00DAE2900BE3} = {9AEB1879-A22A-46BD-B9B5-70348CE8F3CC}
+		{56F910A7-D120-4453-AF1D-594CF8398DC0} = {D8D71BDD-8E82-496A-9F3A-66E035CDC6C5}
+		{8C0BC95E-A79F-49EA-B908-99FD8858F2FD} = {D8D71BDD-8E82-496A-9F3A-66E035CDC6C5}
+		{D8D71BDD-8E82-496A-9F3A-66E035CDC6C5} = {9AEB1879-A22A-46BD-B9B5-70348CE8F3CC}
+		{9CC076AE-C3BC-4F17-8C01-E330D03F4657} = {DE0D36D1-77BA-4FB6-A76A-A53C63634396}
+		{DE0D36D1-77BA-4FB6-A76A-A53C63634396} = {9AEB1879-A22A-46BD-B9B5-70348CE8F3CC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9DE1DE68-219A-4A5E-83A8-C0F0637EE9DF}
diff --git a/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln b/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln
index bca97b23d24a8..d6a4e28428dd1 100644
--- a/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln
+++ b/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln
@@ -27,6 +27,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{FD462F99-C9F6-4D3E-B080-F5E337E8F2F8}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{D5E974B9-EB58-4D32-A4F4-C31559436DEA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{D2D8DF0A-836A-4521-A9F5-349F91E87046}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{198C17DB-F65F-4165-996B-128E3123A6CF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{A92D7FC7-E3A9-4260-8F25-7FCF3AA900DC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{0A6457CF-5932-44F6-9983-978FA163B3A5}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B004DC3D-DA89-4C76-8D15-327CCDB6D7C0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F2D0660B-B4A3-4039-A47D-63F9D1CE19B6}"
@@ -35,6 +45,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{722DCDC1-751
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{8349AD04-5979-4347-A869-7F76B043453E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{1ACFEEFC-7E61-483E-9CAF-1EB2DFC11558}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D99A011B-F48D-4E22-9C5B-050294758522}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{5CB40A8A-59D5-4E57-8F9A-D716C5BDFDC7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0205F064-E9AB-408E-BC47-D1EB62C753C7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +115,26 @@ Global
 		{FD462F99-C9F6-4D3E-B080-F5E337E8F2F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD462F99-C9F6-4D3E-B080-F5E337E8F2F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD462F99-C9F6-4D3E-B080-F5E337E8F2F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5E974B9-EB58-4D32-A4F4-C31559436DEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5E974B9-EB58-4D32-A4F4-C31559436DEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5E974B9-EB58-4D32-A4F4-C31559436DEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D5E974B9-EB58-4D32-A4F4-C31559436DEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2D8DF0A-836A-4521-A9F5-349F91E87046}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2D8DF0A-836A-4521-A9F5-349F91E87046}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2D8DF0A-836A-4521-A9F5-349F91E87046}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2D8DF0A-836A-4521-A9F5-349F91E87046}.Release|Any CPU.Build.0 = Release|Any CPU
+		{198C17DB-F65F-4165-996B-128E3123A6CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{198C17DB-F65F-4165-996B-128E3123A6CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{198C17DB-F65F-4165-996B-128E3123A6CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{198C17DB-F65F-4165-996B-128E3123A6CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A92D7FC7-E3A9-4260-8F25-7FCF3AA900DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A92D7FC7-E3A9-4260-8F25-7FCF3AA900DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A92D7FC7-E3A9-4260-8F25-7FCF3AA900DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A92D7FC7-E3A9-4260-8F25-7FCF3AA900DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A6457CF-5932-44F6-9983-978FA163B3A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A6457CF-5932-44F6-9983-978FA163B3A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A6457CF-5932-44F6-9983-978FA163B3A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A6457CF-5932-44F6-9983-978FA163B3A5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -116,6 +154,14 @@ Global
 		{F06CCE8D-0066-4B17-8EF0-162AE711F6D8} = {8349AD04-5979-4347-A869-7F76B043453E}
 		{315E574D-6A26-4A89-83B5-1C948F3C83D2} = {8349AD04-5979-4347-A869-7F76B043453E}
 		{9ECCC771-064F-403E-8E0E-7B049AAFAD36} = {8349AD04-5979-4347-A869-7F76B043453E}
+		{D5E974B9-EB58-4D32-A4F4-C31559436DEA} = {1ACFEEFC-7E61-483E-9CAF-1EB2DFC11558}
+		{D2D8DF0A-836A-4521-A9F5-349F91E87046} = {1ACFEEFC-7E61-483E-9CAF-1EB2DFC11558}
+		{1ACFEEFC-7E61-483E-9CAF-1EB2DFC11558} = {0205F064-E9AB-408E-BC47-D1EB62C753C7}
+		{198C17DB-F65F-4165-996B-128E3123A6CF} = {D99A011B-F48D-4E22-9C5B-050294758522}
+		{A92D7FC7-E3A9-4260-8F25-7FCF3AA900DC} = {D99A011B-F48D-4E22-9C5B-050294758522}
+		{D99A011B-F48D-4E22-9C5B-050294758522} = {0205F064-E9AB-408E-BC47-D1EB62C753C7}
+		{0A6457CF-5932-44F6-9983-978FA163B3A5} = {5CB40A8A-59D5-4E57-8F9A-D716C5BDFDC7}
+		{5CB40A8A-59D5-4E57-8F9A-D716C5BDFDC7} = {0205F064-E9AB-408E-BC47-D1EB62C753C7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E2DD25F1-FA29-41D5-AB37-65DDC6A49304}
diff --git a/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln b/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln
index c28866ca0674f..b3abf901cb5bb 100644
--- a/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln
+++ b/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln
@@ -27,6 +27,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Numerics", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{ECC6D4C0-600C-400C-8789-DD0FE858A209}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{96D3AF6F-D491-40AA-B199-FA9DB7E5BF6D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{67FBE160-62EE-41E3-81AD-C417DE7446D4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{A58AF475-6F7B-4A64-8F17-06D9D2BE5777}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{832EE19B-72DE-4DCA-90D9-65BB25121F47}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{51B1B61B-453B-4282-914C-87B0F39579B2}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{61790DBD-EAF7-4855-99C4-64FD3FD9E5FE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5690A39F-8BCB-4B98-B230-8734FABEF393}"
@@ -35,6 +45,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7D4FCCCB-BD5
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{425CDAF9-11CA-4C58-B6D4-0CB644481EF9}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{80A9A052-B4F2-414A-B741-5E7F1850928D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{4255C60C-E695-4ECE-83BF-4DD4F3FB3B3E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{07748BF8-404D-4712-93DA-4D66BC22235E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{3EA0059A-3E14-404D-A465-116B0B0C15BC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +115,26 @@ Global
 		{ECC6D4C0-600C-400C-8789-DD0FE858A209}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ECC6D4C0-600C-400C-8789-DD0FE858A209}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ECC6D4C0-600C-400C-8789-DD0FE858A209}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96D3AF6F-D491-40AA-B199-FA9DB7E5BF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96D3AF6F-D491-40AA-B199-FA9DB7E5BF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96D3AF6F-D491-40AA-B199-FA9DB7E5BF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96D3AF6F-D491-40AA-B199-FA9DB7E5BF6D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67FBE160-62EE-41E3-81AD-C417DE7446D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67FBE160-62EE-41E3-81AD-C417DE7446D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67FBE160-62EE-41E3-81AD-C417DE7446D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67FBE160-62EE-41E3-81AD-C417DE7446D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A58AF475-6F7B-4A64-8F17-06D9D2BE5777}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A58AF475-6F7B-4A64-8F17-06D9D2BE5777}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A58AF475-6F7B-4A64-8F17-06D9D2BE5777}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A58AF475-6F7B-4A64-8F17-06D9D2BE5777}.Release|Any CPU.Build.0 = Release|Any CPU
+		{832EE19B-72DE-4DCA-90D9-65BB25121F47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{832EE19B-72DE-4DCA-90D9-65BB25121F47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{832EE19B-72DE-4DCA-90D9-65BB25121F47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{832EE19B-72DE-4DCA-90D9-65BB25121F47}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51B1B61B-453B-4282-914C-87B0F39579B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51B1B61B-453B-4282-914C-87B0F39579B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51B1B61B-453B-4282-914C-87B0F39579B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51B1B61B-453B-4282-914C-87B0F39579B2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -116,6 +154,14 @@ Global
 		{DC4205D2-3644-46E8-86A5-FE23B0BD5EA9} = {425CDAF9-11CA-4C58-B6D4-0CB644481EF9}
 		{078ADF8D-48B1-45A9-913E-20362B63590A} = {425CDAF9-11CA-4C58-B6D4-0CB644481EF9}
 		{B64227A9-23C4-4B99-A5E0-7028CA40FF32} = {425CDAF9-11CA-4C58-B6D4-0CB644481EF9}
+		{96D3AF6F-D491-40AA-B199-FA9DB7E5BF6D} = {80A9A052-B4F2-414A-B741-5E7F1850928D}
+		{67FBE160-62EE-41E3-81AD-C417DE7446D4} = {80A9A052-B4F2-414A-B741-5E7F1850928D}
+		{80A9A052-B4F2-414A-B741-5E7F1850928D} = {3EA0059A-3E14-404D-A465-116B0B0C15BC}
+		{A58AF475-6F7B-4A64-8F17-06D9D2BE5777} = {4255C60C-E695-4ECE-83BF-4DD4F3FB3B3E}
+		{832EE19B-72DE-4DCA-90D9-65BB25121F47} = {4255C60C-E695-4ECE-83BF-4DD4F3FB3B3E}
+		{4255C60C-E695-4ECE-83BF-4DD4F3FB3B3E} = {3EA0059A-3E14-404D-A465-116B0B0C15BC}
+		{51B1B61B-453B-4282-914C-87B0F39579B2} = {07748BF8-404D-4712-93DA-4D66BC22235E}
+		{07748BF8-404D-4712-93DA-4D66BC22235E} = {3EA0059A-3E14-404D-A465-116B0B0C15BC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4DF081FC-DC0D-4317-AB2C-4294B9FE6257}
diff --git a/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln b/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln
index b40a6ad85aa19..e302481c9c8c4 100644
--- a/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln
+++ b/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln
@@ -9,12 +9,20 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "System.Formats.Cbor.Tests.D
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Cbor.Tests", "tests\System.Formats.Cbor.Tests.csproj", "{29879823-0A6F-44A0-B0A5-D90DEC23E4EF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{E6B842CA-18D3-467C-BA83-4A8239EE8C46}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{1A5762F8-12A3-4731-BF4A-186FA9697828}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B054CCD9-E0FD-4F93-B8BC-DD1631B99F69}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{84164104-008B-4B08-99B4-025D410F6B9D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{5071CA6E-644A-4404-85AA-9DD2DA9BEAFC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{B80E033C-5F43-46D0-85A2-888FB157B925}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{329E9318-0A49-480C-BCBF-C3FC9CD2FD99}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A391E863-60F0-4CC6-B279-9224860A3AB0}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{172C0706-C81F-4DDD-A4B8-52B28481FD67}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{46BA9FAE-9204-455A-BB2D-518E5B5C3E4C}"
@@ -23,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B9017269-306
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F186B21D-7138-458B-AEB8-1C1B9711D005}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{3C74B1FB-DF39-4A3D-A51F-74DA04E09F48}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{DA5451CE-D43F-4A5E-98F1-36019CE444FC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{EAB13E9C-F53F-4A79-A255-D19227370863}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{904531B6-B508-4BA5-A9E4-27925AE0B5BE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -49,10 +65,6 @@ Global
 		{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
-		{E6B842CA-18D3-467C-BA83-4A8239EE8C46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6B842CA-18D3-467C-BA83-4A8239EE8C46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6B842CA-18D3-467C-BA83-4A8239EE8C46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E6B842CA-18D3-467C-BA83-4A8239EE8C46}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1A5762F8-12A3-4731-BF4A-186FA9697828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1A5762F8-12A3-4731-BF4A-186FA9697828}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1A5762F8-12A3-4731-BF4A-186FA9697828}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,6 +73,26 @@ Global
 		{B054CCD9-E0FD-4F93-B8BC-DD1631B99F69}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B054CCD9-E0FD-4F93-B8BC-DD1631B99F69}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B054CCD9-E0FD-4F93-B8BC-DD1631B99F69}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84164104-008B-4B08-99B4-025D410F6B9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84164104-008B-4B08-99B4-025D410F6B9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84164104-008B-4B08-99B4-025D410F6B9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84164104-008B-4B08-99B4-025D410F6B9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5071CA6E-644A-4404-85AA-9DD2DA9BEAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5071CA6E-644A-4404-85AA-9DD2DA9BEAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5071CA6E-644A-4404-85AA-9DD2DA9BEAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5071CA6E-644A-4404-85AA-9DD2DA9BEAFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B80E033C-5F43-46D0-85A2-888FB157B925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B80E033C-5F43-46D0-85A2-888FB157B925}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B80E033C-5F43-46D0-85A2-888FB157B925}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B80E033C-5F43-46D0-85A2-888FB157B925}.Release|Any CPU.Build.0 = Release|Any CPU
+		{329E9318-0A49-480C-BCBF-C3FC9CD2FD99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{329E9318-0A49-480C-BCBF-C3FC9CD2FD99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{329E9318-0A49-480C-BCBF-C3FC9CD2FD99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{329E9318-0A49-480C-BCBF-C3FC9CD2FD99}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A391E863-60F0-4CC6-B279-9224860A3AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A391E863-60F0-4CC6-B279-9224860A3AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A391E863-60F0-4CC6-B279-9224860A3AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A391E863-60F0-4CC6-B279-9224860A3AB0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -71,9 +103,16 @@ Global
 		{29879823-0A6F-44A0-B0A5-D90DEC23E4EF} = {172C0706-C81F-4DDD-A4B8-52B28481FD67}
 		{259A1DB6-EF7E-4D45-96EF-035E0605BB55} = {46BA9FAE-9204-455A-BB2D-518E5B5C3E4C}
 		{8D8A522D-D363-4594-81BF-0EB16C0B4713} = {B9017269-3067-4CD3-B1E7-2EA25BCE9F79}
-		{E6B842CA-18D3-467C-BA83-4A8239EE8C46} = {F186B21D-7138-458B-AEB8-1C1B9711D005}
 		{1A5762F8-12A3-4731-BF4A-186FA9697828} = {F186B21D-7138-458B-AEB8-1C1B9711D005}
 		{B054CCD9-E0FD-4F93-B8BC-DD1631B99F69} = {F186B21D-7138-458B-AEB8-1C1B9711D005}
+		{84164104-008B-4B08-99B4-025D410F6B9D} = {3C74B1FB-DF39-4A3D-A51F-74DA04E09F48}
+		{5071CA6E-644A-4404-85AA-9DD2DA9BEAFC} = {3C74B1FB-DF39-4A3D-A51F-74DA04E09F48}
+		{3C74B1FB-DF39-4A3D-A51F-74DA04E09F48} = {904531B6-B508-4BA5-A9E4-27925AE0B5BE}
+		{B80E033C-5F43-46D0-85A2-888FB157B925} = {DA5451CE-D43F-4A5E-98F1-36019CE444FC}
+		{329E9318-0A49-480C-BCBF-C3FC9CD2FD99} = {DA5451CE-D43F-4A5E-98F1-36019CE444FC}
+		{DA5451CE-D43F-4A5E-98F1-36019CE444FC} = {904531B6-B508-4BA5-A9E4-27925AE0B5BE}
+		{A391E863-60F0-4CC6-B279-9224860A3AB0} = {EAB13E9C-F53F-4A79-A255-D19227370863}
+		{EAB13E9C-F53F-4A79-A255-D19227370863} = {904531B6-B508-4BA5-A9E4-27925AE0B5BE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5D247ED0-3E73-46A6-ACC7-523BA1493370}
diff --git a/src/libraries/System.Formats.Tar/System.Formats.Tar.sln b/src/libraries/System.Formats.Tar/System.Formats.Tar.sln
index a5ff8f46a4388..3c8a2aacb8f88 100644
--- a/src/libraries/System.Formats.Tar/System.Formats.Tar.sln
+++ b/src/libraries/System.Formats.Tar/System.Formats.Tar.sln
@@ -7,10 +7,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Tar", "ref\S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Tar", "src\System.Formats.Tar.csproj", "{9F751C2B-56DD-4604-A3F3-568627F8C006}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Tar.Tests", "tests\System.Formats.Tar.Tests.csproj", "{6FD1E284-7B50-4077-B73A-5B31CB0E3577}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Tar.Manual.Tests", "tests\Manual\System.Formats.Tar.Manual.Tests.csproj", "{D2788A26-CDAE-4388-AE4B-A36B0E6DFF9D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Tar.Tests", "tests\System.Formats.Tar.Tests.csproj", "{6FD1E284-7B50-4077-B73A-5B31CB0E3577}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{00477EA4-C3E5-48A9-8CA8-8CCF689E0DB4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{E89FEF3E-E0B9-41C4-A51C-9759AD1A3B69}"
@@ -19,6 +19,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{A00011A0-E609-4A49-B893-EBFC72C98707}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{AFEE875F-22C7-46AE-B28F-AF5C05CA0BA5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{AABA2E7B-6B45-4DD7-9C33-5F0FCDA1193F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{1720175E-27DA-4004-ABF2-DD47A338A3DB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{EB826FA8-035F-4DEF-8767-CBF94446916B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{B2F7C18F-2333-432B-AC5E-9AD672582DF3}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6CF0D830-3EE9-44B1-B548-EA8750AD7B3E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9BE8AFF4-D37B-49AF-AFD3-A15E514AC8AE}"
@@ -27,6 +37,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{55A8C7E4-925
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0345BAA8-92BC-4499-B550-21AC44910FD2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{07E13495-DC86-43BF-9E64-2CEA381D892D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{3CB7A441-325E-41C9-B0D3-30D29CC21E82}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{F845BA28-9AFC-4B52-8ED1-A4302AEB5C11}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{4A77449F-D456-4E19-B31C-7E0E3702680B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -49,6 +67,10 @@ Global
 		{9F751C2B-56DD-4604-A3F3-568627F8C006}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9F751C2B-56DD-4604-A3F3-568627F8C006}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9F751C2B-56DD-4604-A3F3-568627F8C006}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2788A26-CDAE-4388-AE4B-A36B0E6DFF9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2788A26-CDAE-4388-AE4B-A36B0E6DFF9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2788A26-CDAE-4388-AE4B-A36B0E6DFF9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2788A26-CDAE-4388-AE4B-A36B0E6DFF9D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6FD1E284-7B50-4077-B73A-5B31CB0E3577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6FD1E284-7B50-4077-B73A-5B31CB0E3577}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6FD1E284-7B50-4077-B73A-5B31CB0E3577}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -69,10 +91,26 @@ Global
 		{A00011A0-E609-4A49-B893-EBFC72C98707}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A00011A0-E609-4A49-B893-EBFC72C98707}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A00011A0-E609-4A49-B893-EBFC72C98707}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D2788A26-CDAE-4388-AE4B-A36B0E6DFF9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2788A26-CDAE-4388-AE4B-A36B0E6DFF9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2788A26-CDAE-4388-AE4B-A36B0E6DFF9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2788A26-CDAE-4388-AE4B-A36B0E6DFF9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFEE875F-22C7-46AE-B28F-AF5C05CA0BA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFEE875F-22C7-46AE-B28F-AF5C05CA0BA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFEE875F-22C7-46AE-B28F-AF5C05CA0BA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFEE875F-22C7-46AE-B28F-AF5C05CA0BA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AABA2E7B-6B45-4DD7-9C33-5F0FCDA1193F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AABA2E7B-6B45-4DD7-9C33-5F0FCDA1193F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AABA2E7B-6B45-4DD7-9C33-5F0FCDA1193F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AABA2E7B-6B45-4DD7-9C33-5F0FCDA1193F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1720175E-27DA-4004-ABF2-DD47A338A3DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1720175E-27DA-4004-ABF2-DD47A338A3DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1720175E-27DA-4004-ABF2-DD47A338A3DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1720175E-27DA-4004-ABF2-DD47A338A3DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB826FA8-035F-4DEF-8767-CBF94446916B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB826FA8-035F-4DEF-8767-CBF94446916B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB826FA8-035F-4DEF-8767-CBF94446916B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB826FA8-035F-4DEF-8767-CBF94446916B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2F7C18F-2333-432B-AC5E-9AD672582DF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2F7C18F-2333-432B-AC5E-9AD672582DF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2F7C18F-2333-432B-AC5E-9AD672582DF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2F7C18F-2333-432B-AC5E-9AD672582DF3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -80,16 +118,22 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{BE259E6E-B4F5-47DC-93D5-204297098A8C} = {6CF0D830-3EE9-44B1-B548-EA8750AD7B3E}
 		{45972587-B4BF-4F09-94DC-20E2D460FAA8} = {6CF0D830-3EE9-44B1-B548-EA8750AD7B3E}
+		{D2788A26-CDAE-4388-AE4B-A36B0E6DFF9D} = {6CF0D830-3EE9-44B1-B548-EA8750AD7B3E}
 		{6FD1E284-7B50-4077-B73A-5B31CB0E3577} = {6CF0D830-3EE9-44B1-B548-EA8750AD7B3E}
 		{E0B882C6-2082-45F2-806E-568461A61975} = {9BE8AFF4-D37B-49AF-AFD3-A15E514AC8AE}
 		{A00011A0-E609-4A49-B893-EBFC72C98707} = {9BE8AFF4-D37B-49AF-AFD3-A15E514AC8AE}
 		{9F751C2B-56DD-4604-A3F3-568627F8C006} = {55A8C7E4-925C-4F21-B68B-CEFC19137A4B}
-		{6FD1E284-7B50-4077-B73A-5B31CB0E3577} = {6CF0D830-3EE9-44B1-B548-EA8750AD7B3E}
 		{00477EA4-C3E5-48A9-8CA8-8CCF689E0DB4} = {0345BAA8-92BC-4499-B550-21AC44910FD2}
 		{E89FEF3E-E0B9-41C4-A51C-9759AD1A3B69} = {0345BAA8-92BC-4499-B550-21AC44910FD2}
 		{50E6D5FD-0E06-4D07-966E-C28E5448A1D3} = {0345BAA8-92BC-4499-B550-21AC44910FD2}
-		{A00011A0-E609-4A49-B893-EBFC72C98707} = {9BE8AFF4-D37B-49AF-AFD3-A15E514AC8AE}
-		{D2788A26-CDAE-4388-AE4B-A36B0E6DFF9D} = {6CF0D830-3EE9-44B1-B548-EA8750AD7B3E}
+		{AFEE875F-22C7-46AE-B28F-AF5C05CA0BA5} = {07E13495-DC86-43BF-9E64-2CEA381D892D}
+		{AABA2E7B-6B45-4DD7-9C33-5F0FCDA1193F} = {07E13495-DC86-43BF-9E64-2CEA381D892D}
+		{07E13495-DC86-43BF-9E64-2CEA381D892D} = {4A77449F-D456-4E19-B31C-7E0E3702680B}
+		{1720175E-27DA-4004-ABF2-DD47A338A3DB} = {3CB7A441-325E-41C9-B0D3-30D29CC21E82}
+		{EB826FA8-035F-4DEF-8767-CBF94446916B} = {3CB7A441-325E-41C9-B0D3-30D29CC21E82}
+		{3CB7A441-325E-41C9-B0D3-30D29CC21E82} = {4A77449F-D456-4E19-B31C-7E0E3702680B}
+		{B2F7C18F-2333-432B-AC5E-9AD672582DF3} = {F845BA28-9AFC-4B52-8ED1-A4302AEB5C11}
+		{F845BA28-9AFC-4B52-8ED1-A4302AEB5C11} = {4A77449F-D456-4E19-B31C-7E0E3702680B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F9B8DA67-C83B-466D-907C-9541CDBDCFEF}
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 da155f774f641..4c9b9c7bd4bcb 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
@@ -19,6 +19,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{129FE4AC-D499-4900-9505-DDAE214B1FF7}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{79891BE8-C29A-4986-8228-300F7974A2B9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{45B1E687-8334-4115-A53E-FA3377829ED5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{922CA4D3-1BB8-4B59-AAB4-4D9AE9C82897}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{1830F711-3798-496D-9604-D1C24E72D7BD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{CB66C65B-965C-4B1F-9948-74AB3C87007E}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{864B86AD-4BC9-4997-8370-EC8B2055FE08}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1BC1DCD5-DECC-4712-8539-56E6D71A17FF}"
@@ -27,6 +37,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D7FE73BB-2F9
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{4F867226-2107-455D-B378-2FC08BD3F064}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{F5CDB2C5-3D4F-4052-8B52-6F5517F18F11}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{A2F25D23-BC0D-436B-B2DA-6AE556B0EE2E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{CE9B9491-BCA2-4DA3-9C1F-94DAF7511C2D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0BBA414F-EA56-4805-A3E6-7AE68FBB574E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -73,6 +91,26 @@ Global
 		{129FE4AC-D499-4900-9505-DDAE214B1FF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{129FE4AC-D499-4900-9505-DDAE214B1FF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{129FE4AC-D499-4900-9505-DDAE214B1FF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79891BE8-C29A-4986-8228-300F7974A2B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79891BE8-C29A-4986-8228-300F7974A2B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79891BE8-C29A-4986-8228-300F7974A2B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79891BE8-C29A-4986-8228-300F7974A2B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45B1E687-8334-4115-A53E-FA3377829ED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45B1E687-8334-4115-A53E-FA3377829ED5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45B1E687-8334-4115-A53E-FA3377829ED5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45B1E687-8334-4115-A53E-FA3377829ED5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{922CA4D3-1BB8-4B59-AAB4-4D9AE9C82897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{922CA4D3-1BB8-4B59-AAB4-4D9AE9C82897}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{922CA4D3-1BB8-4B59-AAB4-4D9AE9C82897}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{922CA4D3-1BB8-4B59-AAB4-4D9AE9C82897}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1830F711-3798-496D-9604-D1C24E72D7BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1830F711-3798-496D-9604-D1C24E72D7BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1830F711-3798-496D-9604-D1C24E72D7BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1830F711-3798-496D-9604-D1C24E72D7BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB66C65B-965C-4B1F-9948-74AB3C87007E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB66C65B-965C-4B1F-9948-74AB3C87007E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB66C65B-965C-4B1F-9948-74AB3C87007E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB66C65B-965C-4B1F-9948-74AB3C87007E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -88,6 +126,14 @@ Global
 		{A97A0A66-F03A-439B-A943-6F0A8DFD6029} = {4F867226-2107-455D-B378-2FC08BD3F064}
 		{43B12013-5509-43BB-9173-2CFE43B135AA} = {4F867226-2107-455D-B378-2FC08BD3F064}
 		{2AA8D3E7-D2E4-49E8-AE94-461CE261B1BF} = {4F867226-2107-455D-B378-2FC08BD3F064}
+		{79891BE8-C29A-4986-8228-300F7974A2B9} = {F5CDB2C5-3D4F-4052-8B52-6F5517F18F11}
+		{45B1E687-8334-4115-A53E-FA3377829ED5} = {F5CDB2C5-3D4F-4052-8B52-6F5517F18F11}
+		{F5CDB2C5-3D4F-4052-8B52-6F5517F18F11} = {0BBA414F-EA56-4805-A3E6-7AE68FBB574E}
+		{922CA4D3-1BB8-4B59-AAB4-4D9AE9C82897} = {A2F25D23-BC0D-436B-B2DA-6AE556B0EE2E}
+		{1830F711-3798-496D-9604-D1C24E72D7BD} = {A2F25D23-BC0D-436B-B2DA-6AE556B0EE2E}
+		{A2F25D23-BC0D-436B-B2DA-6AE556B0EE2E} = {0BBA414F-EA56-4805-A3E6-7AE68FBB574E}
+		{CB66C65B-965C-4B1F-9948-74AB3C87007E} = {CE9B9491-BCA2-4DA3-9C1F-94DAF7511C2D}
+		{CE9B9491-BCA2-4DA3-9C1F-94DAF7511C2D} = {0BBA414F-EA56-4805-A3E6-7AE68FBB574E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {42B626C7-CDFD-459B-86D8-239917F86516}
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 0b75ff96977da..91bba42be1d23 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
@@ -17,6 +17,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{E181A932-A6F9-4D04-B5ED-82514F484E2E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{43762C19-7FFE-4C19-B642-099B51FEF039}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{92219B88-6903-4642-A14F-5F624CCE91C7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{DECE33E6-B36E-40CC-9234-416658EE93A3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{EE18F8EB-D4E3-40D5-B5BA-989901D0F125}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{2EBC132B-62E3-424A-8487-81E195CC9934}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A46DB030-84B9-49C0-8F75-98FE1290EF88}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A8BAE96C-3EAD-4E68-BBB0-A4854F386CC4}"
@@ -25,6 +35,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5C592E59-B3F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{82C30050-0689-4C48-AA32-E7137F0417DC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{5514616F-E12B-4057-9897-E4302DEA379B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{CAD86FBB-7A97-4FC0-8ED3-8151F040BC63}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{F5E0B219-F2C0-4FF5-8F76-5CD9E6394B01}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{7600CCE2-7817-4B76-989B-74F6AE8A46A7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,6 +85,26 @@ Global
 		{E181A932-A6F9-4D04-B5ED-82514F484E2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E181A932-A6F9-4D04-B5ED-82514F484E2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E181A932-A6F9-4D04-B5ED-82514F484E2E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43762C19-7FFE-4C19-B642-099B51FEF039}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43762C19-7FFE-4C19-B642-099B51FEF039}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43762C19-7FFE-4C19-B642-099B51FEF039}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43762C19-7FFE-4C19-B642-099B51FEF039}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92219B88-6903-4642-A14F-5F624CCE91C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92219B88-6903-4642-A14F-5F624CCE91C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92219B88-6903-4642-A14F-5F624CCE91C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92219B88-6903-4642-A14F-5F624CCE91C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DECE33E6-B36E-40CC-9234-416658EE93A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DECE33E6-B36E-40CC-9234-416658EE93A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DECE33E6-B36E-40CC-9234-416658EE93A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DECE33E6-B36E-40CC-9234-416658EE93A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE18F8EB-D4E3-40D5-B5BA-989901D0F125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE18F8EB-D4E3-40D5-B5BA-989901D0F125}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE18F8EB-D4E3-40D5-B5BA-989901D0F125}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE18F8EB-D4E3-40D5-B5BA-989901D0F125}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2EBC132B-62E3-424A-8487-81E195CC9934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2EBC132B-62E3-424A-8487-81E195CC9934}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2EBC132B-62E3-424A-8487-81E195CC9934}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2EBC132B-62E3-424A-8487-81E195CC9934}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -81,6 +119,14 @@ Global
 		{96882887-EDCB-474D-95DB-D510FF90B3A1} = {82C30050-0689-4C48-AA32-E7137F0417DC}
 		{AE18A377-AAE7-488B-A873-8463A2706BC0} = {82C30050-0689-4C48-AA32-E7137F0417DC}
 		{5DC533A5-D0F0-488B-81C2-7AD7546528DD} = {82C30050-0689-4C48-AA32-E7137F0417DC}
+		{43762C19-7FFE-4C19-B642-099B51FEF039} = {5514616F-E12B-4057-9897-E4302DEA379B}
+		{92219B88-6903-4642-A14F-5F624CCE91C7} = {5514616F-E12B-4057-9897-E4302DEA379B}
+		{5514616F-E12B-4057-9897-E4302DEA379B} = {7600CCE2-7817-4B76-989B-74F6AE8A46A7}
+		{DECE33E6-B36E-40CC-9234-416658EE93A3} = {CAD86FBB-7A97-4FC0-8ED3-8151F040BC63}
+		{EE18F8EB-D4E3-40D5-B5BA-989901D0F125} = {CAD86FBB-7A97-4FC0-8ED3-8151F040BC63}
+		{CAD86FBB-7A97-4FC0-8ED3-8151F040BC63} = {7600CCE2-7817-4B76-989B-74F6AE8A46A7}
+		{2EBC132B-62E3-424A-8487-81E195CC9934} = {F5E0B219-F2C0-4FF5-8F76-5CD9E6394B01}
+		{F5E0B219-F2C0-4FF5-8F76-5CD9E6394B01} = {7600CCE2-7817-4B76-989B-74F6AE8A46A7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D2E26432-A647-4E61-9A30-DE6C62BBD632}
diff --git a/src/libraries/System.IO.Compression/System.IO.Compression.sln b/src/libraries/System.IO.Compression/System.IO.Compression.sln
index 3060af9b800a2..dc980dd95d842 100644
--- a/src/libraries/System.IO.Compression/System.IO.Compression.sln
+++ b/src/libraries/System.IO.Compression/System.IO.Compression.sln
@@ -17,6 +17,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{BB89CCB0-227A-480D-B6D4-91D680278211}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{A51CB0A3-A6A1-402E-B3AF-E6293EE28FB8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{FA8DBFE2-5D0E-448F-B179-9FD391F6FB5A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{B9BCBA20-C5E1-43CF-84BE-0ACA23B69CA5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{3E6E5B6B-22E9-4CCC-A476-6C59DCD321DB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{F2ACABDD-3AFC-451D-8459-204BAC5626B3}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BB657E6F-1D06-4E7A-B4C2-B40A071A2A44}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{350F6B1E-B006-4EA5-BA9E-41F57FF84FF1}"
@@ -25,6 +35,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8541C42E-9FC
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BA616F42-6B1E-4333-9698-C39EA13AEEA2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D61359E8-8A03-4D16-BC52-32FFE3D0974A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{F26573FA-11F7-4E0D-8D66-D8273C5814D6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{29BE512B-0070-4939-8993-7B0C8B993F11}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{9118055E-B74F-4FF4-AC92-FB4AF9D54CEE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,6 +85,26 @@ Global
 		{BB89CCB0-227A-480D-B6D4-91D680278211}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BB89CCB0-227A-480D-B6D4-91D680278211}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB89CCB0-227A-480D-B6D4-91D680278211}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A51CB0A3-A6A1-402E-B3AF-E6293EE28FB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A51CB0A3-A6A1-402E-B3AF-E6293EE28FB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A51CB0A3-A6A1-402E-B3AF-E6293EE28FB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A51CB0A3-A6A1-402E-B3AF-E6293EE28FB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA8DBFE2-5D0E-448F-B179-9FD391F6FB5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA8DBFE2-5D0E-448F-B179-9FD391F6FB5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA8DBFE2-5D0E-448F-B179-9FD391F6FB5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA8DBFE2-5D0E-448F-B179-9FD391F6FB5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9BCBA20-C5E1-43CF-84BE-0ACA23B69CA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9BCBA20-C5E1-43CF-84BE-0ACA23B69CA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9BCBA20-C5E1-43CF-84BE-0ACA23B69CA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9BCBA20-C5E1-43CF-84BE-0ACA23B69CA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E6E5B6B-22E9-4CCC-A476-6C59DCD321DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E6E5B6B-22E9-4CCC-A476-6C59DCD321DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E6E5B6B-22E9-4CCC-A476-6C59DCD321DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E6E5B6B-22E9-4CCC-A476-6C59DCD321DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F2ACABDD-3AFC-451D-8459-204BAC5626B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2ACABDD-3AFC-451D-8459-204BAC5626B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2ACABDD-3AFC-451D-8459-204BAC5626B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2ACABDD-3AFC-451D-8459-204BAC5626B3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -81,6 +119,14 @@ Global
 		{6CD1A771-F838-4F58-A174-203C02644EDE} = {BA616F42-6B1E-4333-9698-C39EA13AEEA2}
 		{77B12FDD-F00D-4EA0-A802-2A0C12D0CE96} = {BA616F42-6B1E-4333-9698-C39EA13AEEA2}
 		{9A07A277-2896-48FC-8A20-5E290069B07D} = {BA616F42-6B1E-4333-9698-C39EA13AEEA2}
+		{A51CB0A3-A6A1-402E-B3AF-E6293EE28FB8} = {D61359E8-8A03-4D16-BC52-32FFE3D0974A}
+		{FA8DBFE2-5D0E-448F-B179-9FD391F6FB5A} = {D61359E8-8A03-4D16-BC52-32FFE3D0974A}
+		{D61359E8-8A03-4D16-BC52-32FFE3D0974A} = {9118055E-B74F-4FF4-AC92-FB4AF9D54CEE}
+		{B9BCBA20-C5E1-43CF-84BE-0ACA23B69CA5} = {F26573FA-11F7-4E0D-8D66-D8273C5814D6}
+		{3E6E5B6B-22E9-4CCC-A476-6C59DCD321DB} = {F26573FA-11F7-4E0D-8D66-D8273C5814D6}
+		{F26573FA-11F7-4E0D-8D66-D8273C5814D6} = {9118055E-B74F-4FF4-AC92-FB4AF9D54CEE}
+		{F2ACABDD-3AFC-451D-8459-204BAC5626B3} = {29BE512B-0070-4939-8993-7B0C8B993F11}
+		{29BE512B-0070-4939-8993-7B0C8B993F11} = {9118055E-B74F-4FF4-AC92-FB4AF9D54CEE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0F6F5B24-5CE5-45F2-9169-FEBEF2A3FE80}
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 55282c908d0b7..810005d6ae425 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,6 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{C08AA67B-28B8-4E38-AE15-28491454DAB7}"
+EndProject
 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.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{A12C0558-44E2-48FB-9075-1EB8A2D0F247}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj", "{D5DE5382-A5FD-46FD-9EAF-02541C26586B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\ref\System.DirectoryServices.csproj", "{071FC282-9840-4920-B0FD-BE778449B5FF}"
@@ -13,6 +17,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Access
 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.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{0A653F6C-C75E-47C4-85F9-5C1013E381D7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{19FC160B-AF59-4AF6-90F9-30411BE14BC4}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{974F81BC-FDCE-404E-B8D7-12A48E27F005}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4E815F64-6F9A-485D-825D-930830F7EABB}"
@@ -21,6 +31,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{A80974ED-DDC6-4A21-A874-F85AE729AF0E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{AC322781-E4FD-48FF-997E-D300FA0DEBEE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims", "..\System.Security.Claims\ref\System.Security.Claims.csproj", "{73429869-3F3A-40B4-B06B-CC9D04ACEE65}"
@@ -35,115 +47,708 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{92BBE16A-0444-4CDD-9351-C2018859DD3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{46DF5480-1E6D-4F0A-A93E-25833F1C598E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{4CF2EB1E-B815-4785-B997-3A16AA3A0277}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{C8E7D84C-DE30-4830-A2A1-8B9A48618004}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{83A69FA0-74D2-401C-B0C9-3EFD912EF037}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{293533FE-82F7-4679-912B-5A2C6E3C4B0C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{57A0D612-ABD4-4328-A51D-0D913B57D0ED}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{92BBE16A-0444-4CDD-9351-C2018859DD3A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{7227D008-BBBE-48D0-979B-9BC483BA7E60}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{55C6D9AC-165E-4CD8-B1CE-898F8A2040C3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{4E47C46F-56AF-4C71-A2F6-228110B26E77}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C6D3DFD4-8B2A-4C87-8EE4-2804B917F6E3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{5C271349-65D8-4015-9066-ED19C527D271}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm = Debug|arm
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm = Release|arm
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Debug|Any CPU.Build.0 = Debug|x64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Debug|arm.ActiveCfg = Debug|arm
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Debug|arm.Build.0 = Debug|arm
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Debug|arm64.ActiveCfg = Debug|arm64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Debug|arm64.Build.0 = Debug|arm64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Debug|x64.ActiveCfg = Debug|x64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Debug|x64.Build.0 = Debug|x64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Debug|x86.ActiveCfg = Debug|x86
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Debug|x86.Build.0 = Debug|x86
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Release|Any CPU.ActiveCfg = Release|x64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Release|Any CPU.Build.0 = Release|x64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Release|arm.ActiveCfg = Release|arm
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Release|arm.Build.0 = Release|arm
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Release|arm64.ActiveCfg = Release|arm64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Release|arm64.Build.0 = Release|arm64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Release|x64.ActiveCfg = Release|x64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Release|x64.Build.0 = Release|x64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Release|x86.ActiveCfg = Release|x86
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Release|x86.Build.0 = Release|x86
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Checked|Any CPU.Build.0 = Checked|x64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Checked|arm.ActiveCfg = Checked|arm
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Checked|arm.Build.0 = Checked|arm
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Checked|arm64.ActiveCfg = Checked|arm64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Checked|arm64.Build.0 = Checked|arm64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Checked|x64.ActiveCfg = Checked|x64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Checked|x64.Build.0 = Checked|x64
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Checked|x86.ActiveCfg = Checked|x86
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7}.Checked|x86.Build.0 = Checked|x86
 		{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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Debug|x64.Build.0 = Debug|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Debug|x86.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
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Release|arm.ActiveCfg = Release|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Release|x64.ActiveCfg = Release|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Release|x64.Build.0 = Release|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Release|x86.ActiveCfg = Release|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Release|x86.Build.0 = Release|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Debug|x64.Build.0 = Debug|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Debug|x86.Build.0 = Debug|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Release|arm.ActiveCfg = Release|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Release|x64.ActiveCfg = Release|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Release|x64.Build.0 = Release|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Release|x86.ActiveCfg = Release|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Release|x86.Build.0 = Release|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Debug|x64.Build.0 = Debug|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Debug|x86.Build.0 = Debug|Any CPU
 		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Release|arm.ActiveCfg = Release|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Release|x64.ActiveCfg = Release|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Release|x64.Build.0 = Release|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Release|x86.ActiveCfg = Release|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Release|x86.Build.0 = Release|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D5DE5382-A5FD-46FD-9EAF-02541C26586B}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Debug|x64.Build.0 = Debug|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Debug|x86.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
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Release|arm.ActiveCfg = Release|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Release|x64.ActiveCfg = Release|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Release|x64.Build.0 = Release|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Release|x86.ActiveCfg = Release|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Release|x86.Build.0 = Release|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Debug|x64.Build.0 = Debug|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Debug|x86.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
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Release|arm.ActiveCfg = Release|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Release|x64.ActiveCfg = Release|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Release|x64.Build.0 = Release|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Release|x86.ActiveCfg = Release|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Release|x86.Build.0 = Release|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Debug|x64.Build.0 = Debug|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Debug|x86.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
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Release|arm.ActiveCfg = Release|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Release|x64.ActiveCfg = Release|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Release|x64.Build.0 = Release|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Release|x86.ActiveCfg = Release|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Release|x86.Build.0 = Release|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Debug|x64.Build.0 = Debug|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Debug|x86.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
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Release|arm.ActiveCfg = Release|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Release|arm64.ActiveCfg = Release|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Release|x64.ActiveCfg = Release|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Release|x64.Build.0 = Release|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Release|x86.ActiveCfg = Release|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Release|x86.Build.0 = Release|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Debug|x64.Build.0 = Debug|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Debug|x86.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
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Release|arm.ActiveCfg = Release|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Release|x64.ActiveCfg = Release|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Release|x64.Build.0 = Release|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Release|x86.ActiveCfg = Release|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Release|x86.Build.0 = Release|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Debug|x64.Build.0 = Debug|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Debug|x86.Build.0 = Debug|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Release|arm.ActiveCfg = Release|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Release|arm64.ActiveCfg = Release|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Release|x64.ActiveCfg = Release|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Release|x64.Build.0 = Release|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Release|x86.Build.0 = Release|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Debug|x64.Build.0 = Debug|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Debug|x86.Build.0 = Debug|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Release|arm.ActiveCfg = Release|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Release|x64.ActiveCfg = Release|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Release|x64.Build.0 = Release|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Release|x86.ActiveCfg = Release|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Release|x86.Build.0 = Release|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Release|arm.ActiveCfg = Release|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Release|arm64.ActiveCfg = Release|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Release|x64.Build.0 = Release|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Release|x86.Build.0 = Release|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Debug|x64.Build.0 = Debug|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Debug|x86.Build.0 = Debug|Any CPU
 		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Release|Any CPU.Build.0 = Release|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Release|arm.ActiveCfg = Release|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Release|arm64.ActiveCfg = Release|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Release|x64.ActiveCfg = Release|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Release|x64.Build.0 = Release|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Release|x86.ActiveCfg = Release|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Release|x86.Build.0 = Release|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{974F81BC-FDCE-404E-B8D7-12A48E27F005}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{4E815F64-6F9A-485D-825D-930830F7EABB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4E815F64-6F9A-485D-825D-930830F7EABB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Debug|x64.Build.0 = Debug|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Debug|x86.Build.0 = Debug|Any CPU
 		{4E815F64-6F9A-485D-825D-930830F7EABB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4E815F64-6F9A-485D-825D-930830F7EABB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Release|arm.ActiveCfg = Release|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Release|x64.ActiveCfg = Release|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Release|x64.Build.0 = Release|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Release|x86.ActiveCfg = Release|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Release|x86.Build.0 = Release|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4E815F64-6F9A-485D-825D-930830F7EABB}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Debug|x64.Build.0 = Debug|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Debug|x86.Build.0 = Debug|Any CPU
 		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Release|arm.ActiveCfg = Release|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Release|x64.ActiveCfg = Release|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Release|x64.Build.0 = Release|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Release|x86.ActiveCfg = Release|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Release|x86.Build.0 = Release|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Debug|x64.Build.0 = Debug|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Debug|x86.Build.0 = Debug|Any CPU
 		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Release|arm.ActiveCfg = Release|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Release|x64.ActiveCfg = Release|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Release|x64.Build.0 = Release|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Release|x86.ActiveCfg = Release|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Release|x86.Build.0 = Release|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A80974ED-DDC6-4A21-A874-F85AE729AF0E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Debug|x64.Build.0 = Debug|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Debug|x86.Build.0 = Debug|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Release|arm.ActiveCfg = Release|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Release|arm64.ActiveCfg = Release|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Release|x64.ActiveCfg = Release|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Release|x64.Build.0 = Release|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Release|x86.ActiveCfg = Release|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Release|x86.Build.0 = Release|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Debug|x64.Build.0 = Debug|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Debug|x86.Build.0 = Debug|Any CPU
 		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Release|arm.ActiveCfg = Release|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Release|x64.ActiveCfg = Release|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Release|x64.Build.0 = Release|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Release|x86.ActiveCfg = Release|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Release|x86.Build.0 = Release|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AC322781-E4FD-48FF-997E-D300FA0DEBEE}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Debug|x64.Build.0 = Debug|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Debug|x86.Build.0 = Debug|Any CPU
 		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Release|Any CPU.Build.0 = Release|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Release|arm.ActiveCfg = Release|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Release|arm64.ActiveCfg = Release|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Release|x64.ActiveCfg = Release|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Release|x64.Build.0 = Release|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Release|x86.ActiveCfg = Release|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Release|x86.Build.0 = Release|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{73429869-3F3A-40B4-B06B-CC9D04ACEE65}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Debug|x64.Build.0 = Debug|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Debug|x86.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
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Release|arm.ActiveCfg = Release|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Release|arm64.ActiveCfg = Release|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Release|x64.ActiveCfg = Release|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Release|x64.Build.0 = Release|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Release|x86.ActiveCfg = Release|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Release|x86.Build.0 = Release|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Debug|x64.Build.0 = Debug|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Debug|x86.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
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Release|arm.ActiveCfg = Release|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Release|arm64.ActiveCfg = Release|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Release|x64.ActiveCfg = Release|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Release|x64.Build.0 = Release|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Release|x86.ActiveCfg = Release|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Release|x86.Build.0 = Release|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Debug|x64.Build.0 = Debug|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Debug|x86.Build.0 = Debug|Any CPU
 		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Release|arm.ActiveCfg = Release|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Release|arm64.ActiveCfg = Release|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Release|x64.ActiveCfg = Release|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Release|x64.Build.0 = Release|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Release|x86.ActiveCfg = Release|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Release|x86.Build.0 = Release|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Debug|x64.Build.0 = Debug|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Debug|x86.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
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Release|arm.ActiveCfg = Release|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Release|x64.ActiveCfg = Release|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Release|x64.Build.0 = Release|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Release|x86.ActiveCfg = Release|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Release|x86.Build.0 = Release|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Debug|x64.Build.0 = Debug|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Debug|x86.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
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Release|arm.ActiveCfg = Release|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Release|x64.ActiveCfg = Release|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Release|x64.Build.0 = Release|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Release|x86.ActiveCfg = Release|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Release|x86.Build.0 = Release|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Debug|x64.Build.0 = Debug|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Debug|x86.Build.0 = Debug|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Release|arm.ActiveCfg = Release|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Release|x64.ActiveCfg = Release|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Release|x64.Build.0 = Release|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Release|x86.ActiveCfg = Release|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Release|x86.Build.0 = Release|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Debug|x64.Build.0 = Debug|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Debug|x86.Build.0 = Debug|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Release|arm.ActiveCfg = Release|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Release|x64.ActiveCfg = Release|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Release|x64.Build.0 = Release|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Release|x86.ActiveCfg = Release|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Release|x86.Build.0 = Release|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Debug|x64.Build.0 = Debug|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Debug|x86.Build.0 = Debug|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Release|arm.ActiveCfg = Release|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Release|x64.ActiveCfg = Release|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Release|x64.Build.0 = Release|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Release|x86.ActiveCfg = Release|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Release|x86.Build.0 = Release|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Debug|x64.Build.0 = Debug|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Debug|x86.Build.0 = Debug|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Release|arm.ActiveCfg = Release|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Release|arm64.ActiveCfg = Release|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Release|x64.ActiveCfg = Release|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Release|x64.Build.0 = Release|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Release|x86.ActiveCfg = Release|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Release|x86.Build.0 = Release|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Debug|x64.Build.0 = Debug|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Debug|x86.Build.0 = Debug|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Release|arm.ActiveCfg = Release|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Release|x64.ActiveCfg = Release|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Release|x64.Build.0 = Release|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Release|x86.ActiveCfg = Release|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Release|x86.Build.0 = Release|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{C08AA67B-28B8-4E38-AE15-28491454DAB7} = {57A0D612-ABD4-4328-A51D-0D913B57D0ED}
 		{18FD488A-2A3F-4B40-B65D-7108688D350F} = {92BBE16A-0444-4CDD-9351-C2018859DD3A}
 		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2} = {92BBE16A-0444-4CDD-9351-C2018859DD3A}
+		{A12C0558-44E2-48FB-9075-1EB8A2D0F247} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}
+		{19FC160B-AF59-4AF6-90F9-30411BE14BC4} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}
+		{82D2A3A9-0784-4CFC-91E1-8A963FE22ADB} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}
 		{D5DE5382-A5FD-46FD-9EAF-02541C26586B} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094}
 		{071FC282-9840-4920-B0FD-BE778449B5FF} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094}
 		{D7E6A261-C80A-4E51-BCDD-85DD595866B9} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094}
+		{1D9B7442-BF5B-4AF3-A07F-F59AE99CF394} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094}
 		{A80974ED-DDC6-4A21-A874-F85AE729AF0E} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094}
 		{AC322781-E4FD-48FF-997E-D300FA0DEBEE} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094}
 		{73429869-3F3A-40B4-B06B-CC9D04ACEE65} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094}
 		{37F8ED93-FD45-4941-B83E-84D278B8EA83} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094}
 		{831E2BC5-C753-4CDD-B81D-699CEDA9F0A7} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094}
 		{F33F1171-273A-4BC3-B138-25E5E7118186} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094}
-		{4EF591E4-175E-494D-8191-15C2D6C6E2E6} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}
-		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}
-		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}
-		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}
+		{0A653F6C-C75E-47C4-85F9-5C1013E381D7} = {7227D008-BBBE-48D0-979B-9BC483BA7E60}
 		{974F81BC-FDCE-404E-B8D7-12A48E27F005} = {7227D008-BBBE-48D0-979B-9BC483BA7E60}
 		{4E815F64-6F9A-485D-825D-930830F7EABB} = {7227D008-BBBE-48D0-979B-9BC483BA7E60}
 		{E939A1C0-31C6-4EA6-9020-ADDE06272528} = {7227D008-BBBE-48D0-979B-9BC483BA7E60}
+		{46DF5480-1E6D-4F0A-A93E-25833F1C598E} = {55C6D9AC-165E-4CD8-B1CE-898F8A2040C3}
+		{4CF2EB1E-B815-4785-B997-3A16AA3A0277} = {55C6D9AC-165E-4CD8-B1CE-898F8A2040C3}
+		{55C6D9AC-165E-4CD8-B1CE-898F8A2040C3} = {5C271349-65D8-4015-9066-ED19C527D271}
+		{C8E7D84C-DE30-4830-A2A1-8B9A48618004} = {4E47C46F-56AF-4C71-A2F6-228110B26E77}
+		{83A69FA0-74D2-401C-B0C9-3EFD912EF037} = {4E47C46F-56AF-4C71-A2F6-228110B26E77}
+		{4E47C46F-56AF-4C71-A2F6-228110B26E77} = {5C271349-65D8-4015-9066-ED19C527D271}
+		{293533FE-82F7-4679-912B-5A2C6E3C4B0C} = {C6D3DFD4-8B2A-4C87-8EE4-2804B917F6E3}
+		{C6D3DFD4-8B2A-4C87-8EE4-2804B917F6E3} = {5C271349-65D8-4015-9066-ED19C527D271}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {246C2EDA-448E-4E76-B97A-BD93DC6883A7}
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 4c811453778d7..21280f2adf0fc 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
@@ -15,6 +15,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{C84193AC-A010-4A92-9B72-4F8C75CF7389}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{C0BEFD2A-1FF5-4EA5-8E9D-02CD6D5205E2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{2427104F-BB50-4BCE-AE28-78B699C27F97}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{06A14BC2-B5F8-4E67-A86F-09329A81307A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{E6344D1B-0137-4856-8CE0-13B2F95214CA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{0BFF5AFC-3D7D-4706-85BC-6F786F53C5F7}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F74D982D-DFE5-48DA-87C0-245FC612F118}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4626E870-1F74-4ED4-AF80-DDDD42DEF47E}"
@@ -23,6 +33,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F20F7286-4DF
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{9BFF66A7-7077-4C69-BAB7-5FE6E2D9DBBC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{B939865D-DC8A-4B55-91C7-DA3F2DDD2252}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{0189DC86-1BAD-40A8-BC84-1187937C2DD4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{CCE645B1-5A02-4EDD-983D-365761F08F41}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{69FBE846-BC0C-4B1B-AA8A-D3275D33DBBB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,6 +79,26 @@ Global
 		{C84193AC-A010-4A92-9B72-4F8C75CF7389}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C84193AC-A010-4A92-9B72-4F8C75CF7389}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C84193AC-A010-4A92-9B72-4F8C75CF7389}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0BEFD2A-1FF5-4EA5-8E9D-02CD6D5205E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0BEFD2A-1FF5-4EA5-8E9D-02CD6D5205E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0BEFD2A-1FF5-4EA5-8E9D-02CD6D5205E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0BEFD2A-1FF5-4EA5-8E9D-02CD6D5205E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2427104F-BB50-4BCE-AE28-78B699C27F97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2427104F-BB50-4BCE-AE28-78B699C27F97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2427104F-BB50-4BCE-AE28-78B699C27F97}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2427104F-BB50-4BCE-AE28-78B699C27F97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06A14BC2-B5F8-4E67-A86F-09329A81307A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06A14BC2-B5F8-4E67-A86F-09329A81307A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06A14BC2-B5F8-4E67-A86F-09329A81307A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06A14BC2-B5F8-4E67-A86F-09329A81307A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6344D1B-0137-4856-8CE0-13B2F95214CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6344D1B-0137-4856-8CE0-13B2F95214CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6344D1B-0137-4856-8CE0-13B2F95214CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6344D1B-0137-4856-8CE0-13B2F95214CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BFF5AFC-3D7D-4706-85BC-6F786F53C5F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BFF5AFC-3D7D-4706-85BC-6F786F53C5F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BFF5AFC-3D7D-4706-85BC-6F786F53C5F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0BFF5AFC-3D7D-4706-85BC-6F786F53C5F7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -74,6 +112,14 @@ Global
 		{08499DD2-78CA-48DD-A58A-90DEC1958826} = {9BFF66A7-7077-4C69-BAB7-5FE6E2D9DBBC}
 		{FBEEAA13-A404-4BB5-AE41-098F2D9B4E15} = {9BFF66A7-7077-4C69-BAB7-5FE6E2D9DBBC}
 		{B9E98144-5561-4CED-BC68-93021B390983} = {9BFF66A7-7077-4C69-BAB7-5FE6E2D9DBBC}
+		{C0BEFD2A-1FF5-4EA5-8E9D-02CD6D5205E2} = {B939865D-DC8A-4B55-91C7-DA3F2DDD2252}
+		{2427104F-BB50-4BCE-AE28-78B699C27F97} = {B939865D-DC8A-4B55-91C7-DA3F2DDD2252}
+		{B939865D-DC8A-4B55-91C7-DA3F2DDD2252} = {69FBE846-BC0C-4B1B-AA8A-D3275D33DBBB}
+		{06A14BC2-B5F8-4E67-A86F-09329A81307A} = {0189DC86-1BAD-40A8-BC84-1187937C2DD4}
+		{E6344D1B-0137-4856-8CE0-13B2F95214CA} = {0189DC86-1BAD-40A8-BC84-1187937C2DD4}
+		{0189DC86-1BAD-40A8-BC84-1187937C2DD4} = {69FBE846-BC0C-4B1B-AA8A-D3275D33DBBB}
+		{0BFF5AFC-3D7D-4706-85BC-6F786F53C5F7} = {CCE645B1-5A02-4EDD-983D-365761F08F41}
+		{CCE645B1-5A02-4EDD-983D-365761F08F41} = {69FBE846-BC0C-4B1B-AA8A-D3275D33DBBB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AF704C7D-836B-41D4-919E-B0874D934A08}
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 52f31942224eb..6bc617eeb4df9 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
@@ -25,6 +25,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{11864EE6-ADBD-417F-9D7C-58D4057F6A65}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{387AA89D-B62A-4B06-8C0E-AAD444DE15C0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{79478BEC-93B2-4405-BAF8-9A2762D35BD1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{32071CD0-902E-4A56-B058-776589523FC0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{B1859374-5511-4C0A-8337-0EDEFAB2B63C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{557FC283-4FB9-4B8B-9C9D-A461374C0573}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A4E6A754-5006-4E2F-BC57-0A96E3A82A4D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FB3E732D-C87B-41E9-ADC2-C2D84B87D04F}"
@@ -33,6 +43,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BCDF2178-959
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{1C8EC715-29EB-40DF-A78F-35636153B267}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D43DD0C3-AA26-40DF-97AE-289CAC95C9C8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{C9D7A0EF-1E1D-42D1-ADC3-B037D225C72F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{EF265246-C5F9-46FA-88FC-5ED0FCA63FED}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{64712DEA-D6C6-4CD6-BEC6-D4F1AB1261C5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,6 +109,26 @@ Global
 		{11864EE6-ADBD-417F-9D7C-58D4057F6A65}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{11864EE6-ADBD-417F-9D7C-58D4057F6A65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11864EE6-ADBD-417F-9D7C-58D4057F6A65}.Release|Any CPU.Build.0 = Release|Any CPU
+		{387AA89D-B62A-4B06-8C0E-AAD444DE15C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{387AA89D-B62A-4B06-8C0E-AAD444DE15C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{387AA89D-B62A-4B06-8C0E-AAD444DE15C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{387AA89D-B62A-4B06-8C0E-AAD444DE15C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79478BEC-93B2-4405-BAF8-9A2762D35BD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79478BEC-93B2-4405-BAF8-9A2762D35BD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79478BEC-93B2-4405-BAF8-9A2762D35BD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79478BEC-93B2-4405-BAF8-9A2762D35BD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32071CD0-902E-4A56-B058-776589523FC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32071CD0-902E-4A56-B058-776589523FC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32071CD0-902E-4A56-B058-776589523FC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32071CD0-902E-4A56-B058-776589523FC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1859374-5511-4C0A-8337-0EDEFAB2B63C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1859374-5511-4C0A-8337-0EDEFAB2B63C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1859374-5511-4C0A-8337-0EDEFAB2B63C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1859374-5511-4C0A-8337-0EDEFAB2B63C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{557FC283-4FB9-4B8B-9C9D-A461374C0573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{557FC283-4FB9-4B8B-9C9D-A461374C0573}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{557FC283-4FB9-4B8B-9C9D-A461374C0573}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{557FC283-4FB9-4B8B-9C9D-A461374C0573}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -109,6 +147,14 @@ Global
 		{D310E128-E5D5-458F-8255-03D8304772A8} = {1C8EC715-29EB-40DF-A78F-35636153B267}
 		{B0C17840-DF58-49D8-9501-D2F1398E3BE4} = {1C8EC715-29EB-40DF-A78F-35636153B267}
 		{DB80E810-8B37-4116-9835-889E16FEC389} = {1C8EC715-29EB-40DF-A78F-35636153B267}
+		{387AA89D-B62A-4B06-8C0E-AAD444DE15C0} = {D43DD0C3-AA26-40DF-97AE-289CAC95C9C8}
+		{79478BEC-93B2-4405-BAF8-9A2762D35BD1} = {D43DD0C3-AA26-40DF-97AE-289CAC95C9C8}
+		{D43DD0C3-AA26-40DF-97AE-289CAC95C9C8} = {64712DEA-D6C6-4CD6-BEC6-D4F1AB1261C5}
+		{32071CD0-902E-4A56-B058-776589523FC0} = {C9D7A0EF-1E1D-42D1-ADC3-B037D225C72F}
+		{B1859374-5511-4C0A-8337-0EDEFAB2B63C} = {C9D7A0EF-1E1D-42D1-ADC3-B037D225C72F}
+		{C9D7A0EF-1E1D-42D1-ADC3-B037D225C72F} = {64712DEA-D6C6-4CD6-BEC6-D4F1AB1261C5}
+		{557FC283-4FB9-4B8B-9C9D-A461374C0573} = {EF265246-C5F9-46FA-88FC-5ED0FCA63FED}
+		{EF265246-C5F9-46FA-88FC-5ED0FCA63FED} = {64712DEA-D6C6-4CD6-BEC6-D4F1AB1261C5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3D76AA3-27C1-48BF-9474-42E0495BA814}
diff --git a/src/libraries/System.IO.Hashing/System.IO.Hashing.sln b/src/libraries/System.IO.Hashing/System.IO.Hashing.sln
index 1f55544e329c2..ce6293aa82648 100644
--- a/src/libraries/System.IO.Hashing/System.IO.Hashing.sln
+++ b/src/libraries/System.IO.Hashing/System.IO.Hashing.sln
@@ -7,12 +7,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Hashing", "src\Sy
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Hashing.Tests", "tests\System.IO.Hashing.Tests.csproj", "{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{1721170A-D96D-4172-9DA0-E53DF8C3CC15}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{0EBDAC1E-7132-406B-96B4-F8875A689C99}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{A60C1BBE-8CD7-4B6A-AD3C-FF1209857C39}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{14F46F30-1D5F-4FB6-B946-0E01BA52F8D9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{724E5FDF-D03B-402C-870E-70E44E02F904}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{5C1B7DE0-C1F4-44CF-BD52-CC459BBB8F3F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{85F8D215-7668-4DA4-A1F8-231883A0199B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{8B933E04-2E8A-46C8-A720-7A35EB3EE24C}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1E78399D-326B-4C9F-B8A9-A7E684EEA349}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{46BA9FAE-9204-455A-BB2D-518E5B5C3E4C}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F2826BE8-9FA
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{26D7BA38-5978-4423-814C-0C8D9F38C1A3}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{7AB7C77C-0497-4E3D-B2A2-AC9D9CAE73E8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{B4539921-62FA-497E-8EAE-B7012DCEE2D5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{A94B241B-DDB9-4F5D-A6C8-2C50E080D1CE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{E64A1BCA-C2B3-4425-AFD1-8F51343B0852}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{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
-		{1721170A-D96D-4172-9DA0-E53DF8C3CC15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1721170A-D96D-4172-9DA0-E53DF8C3CC15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1721170A-D96D-4172-9DA0-E53DF8C3CC15}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1721170A-D96D-4172-9DA0-E53DF8C3CC15}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0EBDAC1E-7132-406B-96B4-F8875A689C99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0EBDAC1E-7132-406B-96B4-F8875A689C99}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0EBDAC1E-7132-406B-96B4-F8875A689C99}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{A60C1BBE-8CD7-4B6A-AD3C-FF1209857C39}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A60C1BBE-8CD7-4B6A-AD3C-FF1209857C39}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A60C1BBE-8CD7-4B6A-AD3C-FF1209857C39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14F46F30-1D5F-4FB6-B946-0E01BA52F8D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14F46F30-1D5F-4FB6-B946-0E01BA52F8D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14F46F30-1D5F-4FB6-B946-0E01BA52F8D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14F46F30-1D5F-4FB6-B946-0E01BA52F8D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{724E5FDF-D03B-402C-870E-70E44E02F904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{724E5FDF-D03B-402C-870E-70E44E02F904}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{724E5FDF-D03B-402C-870E-70E44E02F904}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{724E5FDF-D03B-402C-870E-70E44E02F904}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C1B7DE0-C1F4-44CF-BD52-CC459BBB8F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C1B7DE0-C1F4-44CF-BD52-CC459BBB8F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C1B7DE0-C1F4-44CF-BD52-CC459BBB8F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C1B7DE0-C1F4-44CF-BD52-CC459BBB8F3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85F8D215-7668-4DA4-A1F8-231883A0199B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85F8D215-7668-4DA4-A1F8-231883A0199B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85F8D215-7668-4DA4-A1F8-231883A0199B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85F8D215-7668-4DA4-A1F8-231883A0199B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B933E04-2E8A-46C8-A720-7A35EB3EE24C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B933E04-2E8A-46C8-A720-7A35EB3EE24C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B933E04-2E8A-46C8-A720-7A35EB3EE24C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B933E04-2E8A-46C8-A720-7A35EB3EE24C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,9 +96,16 @@ Global
 		{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294} = {1E78399D-326B-4C9F-B8A9-A7E684EEA349}
 		{259A1DB6-EF7E-4D45-96EF-035E0605BB55} = {46BA9FAE-9204-455A-BB2D-518E5B5C3E4C}
 		{A078A4EB-27E8-42B1-BD44-3807732A4560} = {F2826BE8-9FA1-40C8-8FD4-E98A4644733E}
-		{1721170A-D96D-4172-9DA0-E53DF8C3CC15} = {26D7BA38-5978-4423-814C-0C8D9F38C1A3}
 		{0EBDAC1E-7132-406B-96B4-F8875A689C99} = {26D7BA38-5978-4423-814C-0C8D9F38C1A3}
 		{A60C1BBE-8CD7-4B6A-AD3C-FF1209857C39} = {26D7BA38-5978-4423-814C-0C8D9F38C1A3}
+		{14F46F30-1D5F-4FB6-B946-0E01BA52F8D9} = {7AB7C77C-0497-4E3D-B2A2-AC9D9CAE73E8}
+		{724E5FDF-D03B-402C-870E-70E44E02F904} = {7AB7C77C-0497-4E3D-B2A2-AC9D9CAE73E8}
+		{7AB7C77C-0497-4E3D-B2A2-AC9D9CAE73E8} = {E64A1BCA-C2B3-4425-AFD1-8F51343B0852}
+		{5C1B7DE0-C1F4-44CF-BD52-CC459BBB8F3F} = {B4539921-62FA-497E-8EAE-B7012DCEE2D5}
+		{85F8D215-7668-4DA4-A1F8-231883A0199B} = {B4539921-62FA-497E-8EAE-B7012DCEE2D5}
+		{B4539921-62FA-497E-8EAE-B7012DCEE2D5} = {E64A1BCA-C2B3-4425-AFD1-8F51343B0852}
+		{8B933E04-2E8A-46C8-A720-7A35EB3EE24C} = {A94B241B-DDB9-4F5D-A6C8-2C50E080D1CE}
+		{A94B241B-DDB9-4F5D-A6C8-2C50E080D1CE} = {E64A1BCA-C2B3-4425-AFD1-8F51343B0852}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4DF081FC-DC0D-4317-AB2C-4294B9FE6257}
diff --git a/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln b/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
index eaee56429ab55..e5d27f175e630 100644
--- a/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
+++ b/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
@@ -1,6 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{DC7157AB-FE04-4031-BCF5-400DFCFB1265}"
+EndProject
 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.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\ref\System.DirectoryServices.csproj", "{CBD0D70E-1470-43BF-BE8D-59756A3A2364}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\src\System.DirectoryServices.csproj", "{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}"
@@ -11,7 +15,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.IsolatedStorage",
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{F7489DD4-0C1E-456B-ADF3-D5F8F22E8875}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{15DD6643-975E-47DC-83F2-5A734CA8C027}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{4BE9DDC8-B128-4913-9B2F-0513E9C69991}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{77530357-B4AC-4879-850C-CD4231AA707F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{CB45B17E-7E90-4687-B5CB-697D761FAF8C}"
 EndProject
@@ -19,6 +27,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{7B5CE655-EC0E-4E74-AD96-C50731D88D82}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}"
+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}"
@@ -27,95 +37,598 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{2C9EFD7A-F153-47BF-B2E6-73094696DF45}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BF25957F-9188-4CD6-9581-8E1C998E5AAB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{877446C1-0835-444C-A210-45B0F55E03B6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CBCF137A-F5AD-4CCC-8888-F4B30426B5DE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{DC917904-43C1-4369-BCDC-B96851F72526}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{A589EBE3-F42B-4FA8-A20E-174305B91514}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{034E0757-DF29-4FB0-B75F-0E60C13979FB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{6BC78072-0377-4A0D-890F-C69B51C4FD86}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BF25957F-9188-4CD6-9581-8E1C998E5AAB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D4881A9A-F082-40A1-ABC4-DE232ABB22BA}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CBCF137A-F5AD-4CCC-8888-F4B30426B5DE}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{3424E375-E1DA-46BA-91D2-E1EA86BAF98F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{A7BCEB40-DA50-4D87-8D82-FD5DEEB85C6F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{F1C82E5D-F07F-4FF8-87FC-A460E6578F7A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{5BBF5679-8F82-4601-9BF3-A619CC20171D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{DC513735-2375-4EA7-AEA8-CBE509248CE1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm = Debug|arm
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm = Release|arm
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Debug|Any CPU.Build.0 = Debug|x64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Debug|arm.ActiveCfg = Debug|arm
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Debug|arm.Build.0 = Debug|arm
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Debug|arm64.ActiveCfg = Debug|arm64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Debug|arm64.Build.0 = Debug|arm64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Debug|x64.ActiveCfg = Debug|x64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Debug|x64.Build.0 = Debug|x64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Debug|x86.ActiveCfg = Debug|x86
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Debug|x86.Build.0 = Debug|x86
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Release|Any CPU.ActiveCfg = Release|x64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Release|Any CPU.Build.0 = Release|x64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Release|arm.ActiveCfg = Release|arm
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Release|arm.Build.0 = Release|arm
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Release|arm64.ActiveCfg = Release|arm64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Release|arm64.Build.0 = Release|arm64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Release|x64.ActiveCfg = Release|x64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Release|x64.Build.0 = Release|x64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Release|x86.ActiveCfg = Release|x86
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Release|x86.Build.0 = Release|x86
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Checked|Any CPU.Build.0 = Checked|x64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Checked|arm.ActiveCfg = Checked|arm
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Checked|arm.Build.0 = Checked|arm
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Checked|arm64.ActiveCfg = Checked|arm64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Checked|arm64.Build.0 = Checked|arm64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Checked|x64.ActiveCfg = Checked|x64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Checked|x64.Build.0 = Checked|x64
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Checked|x86.ActiveCfg = Checked|x86
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265}.Checked|x86.Build.0 = Checked|x86
 		{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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Debug|x64.Build.0 = Debug|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Debug|x86.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
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Release|arm.ActiveCfg = Release|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Release|arm64.ActiveCfg = Release|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Release|x64.ActiveCfg = Release|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Release|x64.Build.0 = Release|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Release|x86.ActiveCfg = Release|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Release|x86.Build.0 = Release|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Debug|x64.Build.0 = Debug|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Debug|x86.Build.0 = Debug|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Release|arm.ActiveCfg = Release|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Release|x64.ActiveCfg = Release|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Release|x64.Build.0 = Release|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Release|x86.ActiveCfg = Release|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Release|x86.Build.0 = Release|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Debug|x64.Build.0 = Debug|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Debug|x86.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
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Release|arm.ActiveCfg = Release|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Release|x64.ActiveCfg = Release|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Release|x64.Build.0 = Release|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Release|x86.ActiveCfg = Release|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Release|x86.Build.0 = Release|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Debug|x64.Build.0 = Debug|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Debug|x86.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
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Release|arm.ActiveCfg = Release|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Release|x64.ActiveCfg = Release|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Release|x64.Build.0 = Release|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Release|x86.ActiveCfg = Release|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Release|x86.Build.0 = Release|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Debug|x64.Build.0 = Debug|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Debug|x86.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
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Release|arm.ActiveCfg = Release|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Release|x64.ActiveCfg = Release|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Release|x64.Build.0 = Release|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Release|x86.ActiveCfg = Release|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Release|x86.Build.0 = Release|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Debug|x64.Build.0 = Debug|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Debug|x86.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
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Release|arm.ActiveCfg = Release|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Release|x64.ActiveCfg = Release|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Release|x64.Build.0 = Release|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Release|x86.ActiveCfg = Release|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Release|x86.Build.0 = Release|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Debug|x64.Build.0 = Debug|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Debug|x86.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
-		{F7489DD4-0C1E-456B-ADF3-D5F8F22E8875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F7489DD4-0C1E-456B-ADF3-D5F8F22E8875}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7489DD4-0C1E-456B-ADF3-D5F8F22E8875}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F7489DD4-0C1E-456B-ADF3-D5F8F22E8875}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Release|arm.ActiveCfg = Release|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Release|arm64.ActiveCfg = Release|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Release|x64.ActiveCfg = Release|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Release|x64.Build.0 = Release|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Release|x86.ActiveCfg = Release|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Release|x86.Build.0 = Release|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Debug|x64.Build.0 = Debug|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Debug|x86.Build.0 = Debug|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Release|arm.ActiveCfg = Release|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Release|arm64.ActiveCfg = Release|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Release|x64.ActiveCfg = Release|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Release|x64.Build.0 = Release|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Release|x86.ActiveCfg = Release|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Release|x86.Build.0 = Release|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{15DD6643-975E-47DC-83F2-5A734CA8C027}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Debug|x64.Build.0 = Debug|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Debug|x86.Build.0 = Debug|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Release|arm.ActiveCfg = Release|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Release|x64.ActiveCfg = Release|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Release|x64.Build.0 = Release|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Release|x86.ActiveCfg = Release|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Release|x86.Build.0 = Release|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Debug|x64.Build.0 = Debug|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Debug|x86.Build.0 = Debug|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Release|arm.ActiveCfg = Release|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Release|x64.ActiveCfg = Release|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Release|x64.Build.0 = Release|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Release|x86.ActiveCfg = Release|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Release|x86.Build.0 = Release|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{77530357-B4AC-4879-850C-CD4231AA707F}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Debug|x64.Build.0 = Debug|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Debug|x86.Build.0 = Debug|Any CPU
 		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Release|arm.ActiveCfg = Release|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Release|x64.ActiveCfg = Release|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Release|x64.Build.0 = Release|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Release|x86.ActiveCfg = Release|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Release|x86.Build.0 = Release|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Debug|x64.Build.0 = Debug|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Debug|x86.Build.0 = Debug|Any CPU
 		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Release|arm.ActiveCfg = Release|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Release|x64.ActiveCfg = Release|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Release|x64.Build.0 = Release|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Release|x86.ActiveCfg = Release|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Release|x86.Build.0 = Release|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Debug|x64.Build.0 = Debug|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Debug|x86.Build.0 = Debug|Any CPU
 		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Release|arm.ActiveCfg = Release|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Release|x64.ActiveCfg = Release|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Release|x64.Build.0 = Release|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Release|x86.ActiveCfg = Release|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Release|x86.Build.0 = Release|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7B5CE655-EC0E-4E74-AD96-C50731D88D82}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Debug|x64.Build.0 = Debug|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Debug|x86.Build.0 = Debug|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Release|arm.ActiveCfg = Release|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Release|x64.ActiveCfg = Release|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Release|x64.Build.0 = Release|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Release|x86.ActiveCfg = Release|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Release|x86.Build.0 = Release|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Debug|x64.Build.0 = Debug|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Debug|x86.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
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Release|arm.ActiveCfg = Release|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Release|arm64.ActiveCfg = Release|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Release|x64.ActiveCfg = Release|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Release|x64.Build.0 = Release|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Release|x86.ActiveCfg = Release|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Release|x86.Build.0 = Release|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Debug|x64.Build.0 = Debug|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Debug|x86.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
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Release|arm.ActiveCfg = Release|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Release|x64.ActiveCfg = Release|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Release|x64.Build.0 = Release|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Release|x86.ActiveCfg = Release|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Release|x86.Build.0 = Release|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Debug|x64.Build.0 = Debug|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Debug|x86.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
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Release|arm.ActiveCfg = Release|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Release|x64.ActiveCfg = Release|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Release|x64.Build.0 = Release|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Release|x86.ActiveCfg = Release|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Release|x86.Build.0 = Release|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Debug|x64.Build.0 = Debug|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Debug|x86.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
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Release|arm.ActiveCfg = Release|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Release|x64.ActiveCfg = Release|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Release|x64.Build.0 = Release|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Release|x86.ActiveCfg = Release|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Release|x86.Build.0 = Release|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Debug|x64.Build.0 = Debug|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Debug|x86.Build.0 = Debug|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Release|arm.ActiveCfg = Release|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Release|x64.ActiveCfg = Release|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Release|x64.Build.0 = Release|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Release|x86.ActiveCfg = Release|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Release|x86.Build.0 = Release|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{877446C1-0835-444C-A210-45B0F55E03B6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Debug|x64.Build.0 = Debug|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Debug|x86.Build.0 = Debug|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Release|arm.ActiveCfg = Release|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Release|x64.ActiveCfg = Release|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Release|x64.Build.0 = Release|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Release|x86.ActiveCfg = Release|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Release|x86.Build.0 = Release|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Debug|x64.Build.0 = Debug|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Debug|x86.Build.0 = Debug|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Release|arm.ActiveCfg = Release|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Release|x64.ActiveCfg = Release|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Release|x64.Build.0 = Release|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Release|x86.ActiveCfg = Release|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Release|x86.Build.0 = Release|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DC917904-43C1-4369-BCDC-B96851F72526}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Debug|x64.Build.0 = Debug|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Debug|x86.Build.0 = Debug|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Release|arm.ActiveCfg = Release|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Release|x64.ActiveCfg = Release|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Release|x64.Build.0 = Release|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Release|x86.ActiveCfg = Release|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Release|x86.Build.0 = Release|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A589EBE3-F42B-4FA8-A20E-174305B91514}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Debug|x64.Build.0 = Debug|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Debug|x86.Build.0 = Debug|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Release|arm.ActiveCfg = Release|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Release|arm64.ActiveCfg = Release|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Release|x64.ActiveCfg = Release|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Release|x64.Build.0 = Release|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Release|x86.ActiveCfg = Release|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Release|x86.Build.0 = Release|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{DC7157AB-FE04-4031-BCF5-400DFCFB1265} = {6BC78072-0377-4A0D-890F-C69B51C4FD86}
 		{16B2F442-5A88-4C59-A9FE-AB4357D3E657} = {BF25957F-9188-4CD6-9581-8E1C998E5AAB}
 		{88125FEA-D679-4A1A-8736-A18EC13AFC75} = {BF25957F-9188-4CD6-9581-8E1C998E5AAB}
+		{2D7986A0-48B8-4DB3-A111-CA8DE1F74769} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA}
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA}
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA}
+		{77530357-B4AC-4879-850C-CD4231AA707F} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA}
+		{ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA}
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA}
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA}
 		{CBD0D70E-1470-43BF-BE8D-59756A3A2364} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE}
 		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE}
+		{4BE9DDC8-B128-4913-9B2F-0513E9C69991} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE}
 		{7B5CE655-EC0E-4E74-AD96-C50731D88D82} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE}
 		{94E1FBF3-D07E-42CC-BDE9-195068C29632} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE}
 		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE}
-		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA}
-		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA}
-		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA}
-		{2C9EFD7A-F153-47BF-B2E6-73094696DF45} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA}
-		{F7489DD4-0C1E-456B-ADF3-D5F8F22E8875} = {3424E375-E1DA-46BA-91D2-E1EA86BAF98F}
+		{15DD6643-975E-47DC-83F2-5A734CA8C027} = {3424E375-E1DA-46BA-91D2-E1EA86BAF98F}
 		{CB45B17E-7E90-4687-B5CB-697D761FAF8C} = {3424E375-E1DA-46BA-91D2-E1EA86BAF98F}
 		{4DAA9EA7-245F-45D6-8061-010F7AA64752} = {3424E375-E1DA-46BA-91D2-E1EA86BAF98F}
+		{877446C1-0835-444C-A210-45B0F55E03B6} = {A7BCEB40-DA50-4D87-8D82-FD5DEEB85C6F}
+		{58DD329D-4BEC-4C97-A9D5-6CFB51789D7A} = {A7BCEB40-DA50-4D87-8D82-FD5DEEB85C6F}
+		{A7BCEB40-DA50-4D87-8D82-FD5DEEB85C6F} = {DC513735-2375-4EA7-AEA8-CBE509248CE1}
+		{DC917904-43C1-4369-BCDC-B96851F72526} = {F1C82E5D-F07F-4FF8-87FC-A460E6578F7A}
+		{A589EBE3-F42B-4FA8-A20E-174305B91514} = {F1C82E5D-F07F-4FF8-87FC-A460E6578F7A}
+		{F1C82E5D-F07F-4FF8-87FC-A460E6578F7A} = {DC513735-2375-4EA7-AEA8-CBE509248CE1}
+		{034E0757-DF29-4FB0-B75F-0E60C13979FB} = {5BBF5679-8F82-4601-9BF3-A619CC20171D}
+		{5BBF5679-8F82-4601-9BF3-A619CC20171D} = {DC513735-2375-4EA7-AEA8-CBE509248CE1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C61D5D56-FD5E-4BF4-89D0-E7A23AE83333}
diff --git a/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln b/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
index 3921c4c825364..40578971dacb0 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
+++ b/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
@@ -21,6 +21,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{50241163-53A9-458C-9012-2F17E0CAA201}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{C29327C1-7EF9-4D77-968E-F4AAC9310454}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{B31D95E3-0BAD-4D9E-B12A-737B66E791B9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{428128AD-30E4-4F3F-9BC2-909CF926D696}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{0A7F97B6-CB1E-4D90-A7A6-2CD366BC0171}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{9C723ABA-61D6-4522-8DB5-ADF664ED10B0}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E9193727-72AB-4A35-BABF-A11D7C1A8B04}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E91F427C-6CD7-496B-B4E8-D837CB8B96F8}"
@@ -29,6 +39,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7CDB9185-B43
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{AF9FF36B-5C67-40C3-9BC4-5C8FE09956E2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{615FBB6B-8AEC-4964-9EEB-C79D543B693D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{4101EF52-1BE9-4718-A1A8-F7672F748424}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{27BFC1FC-EA0B-4B24-8DD7-3C9BBD4872AB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{9625D55F-8524-4A03-8CD0-E9B19F14AF44}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,6 +97,26 @@ Global
 		{50241163-53A9-458C-9012-2F17E0CAA201}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{50241163-53A9-458C-9012-2F17E0CAA201}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50241163-53A9-458C-9012-2F17E0CAA201}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C29327C1-7EF9-4D77-968E-F4AAC9310454}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C29327C1-7EF9-4D77-968E-F4AAC9310454}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C29327C1-7EF9-4D77-968E-F4AAC9310454}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C29327C1-7EF9-4D77-968E-F4AAC9310454}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B31D95E3-0BAD-4D9E-B12A-737B66E791B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B31D95E3-0BAD-4D9E-B12A-737B66E791B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B31D95E3-0BAD-4D9E-B12A-737B66E791B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B31D95E3-0BAD-4D9E-B12A-737B66E791B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{428128AD-30E4-4F3F-9BC2-909CF926D696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{428128AD-30E4-4F3F-9BC2-909CF926D696}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{428128AD-30E4-4F3F-9BC2-909CF926D696}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{428128AD-30E4-4F3F-9BC2-909CF926D696}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A7F97B6-CB1E-4D90-A7A6-2CD366BC0171}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A7F97B6-CB1E-4D90-A7A6-2CD366BC0171}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A7F97B6-CB1E-4D90-A7A6-2CD366BC0171}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A7F97B6-CB1E-4D90-A7A6-2CD366BC0171}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C723ABA-61D6-4522-8DB5-ADF664ED10B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C723ABA-61D6-4522-8DB5-ADF664ED10B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C723ABA-61D6-4522-8DB5-ADF664ED10B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C723ABA-61D6-4522-8DB5-ADF664ED10B0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -95,6 +133,14 @@ Global
 		{C96C1E8C-7C96-42F8-ABEB-0D17B44F203E} = {AF9FF36B-5C67-40C3-9BC4-5C8FE09956E2}
 		{08C7C81E-76EF-49D1-A9AA-CB2E0AB6A913} = {AF9FF36B-5C67-40C3-9BC4-5C8FE09956E2}
 		{3D0ED921-30AE-4D7C-BFE7-CC4BD0CE9B40} = {AF9FF36B-5C67-40C3-9BC4-5C8FE09956E2}
+		{C29327C1-7EF9-4D77-968E-F4AAC9310454} = {615FBB6B-8AEC-4964-9EEB-C79D543B693D}
+		{B31D95E3-0BAD-4D9E-B12A-737B66E791B9} = {615FBB6B-8AEC-4964-9EEB-C79D543B693D}
+		{615FBB6B-8AEC-4964-9EEB-C79D543B693D} = {9625D55F-8524-4A03-8CD0-E9B19F14AF44}
+		{428128AD-30E4-4F3F-9BC2-909CF926D696} = {4101EF52-1BE9-4718-A1A8-F7672F748424}
+		{0A7F97B6-CB1E-4D90-A7A6-2CD366BC0171} = {4101EF52-1BE9-4718-A1A8-F7672F748424}
+		{4101EF52-1BE9-4718-A1A8-F7672F748424} = {9625D55F-8524-4A03-8CD0-E9B19F14AF44}
+		{9C723ABA-61D6-4522-8DB5-ADF664ED10B0} = {27BFC1FC-EA0B-4B24-8DD7-3C9BBD4872AB}
+		{27BFC1FC-EA0B-4B24-8DD7-3C9BBD4872AB} = {9625D55F-8524-4A03-8CD0-E9B19F14AF44}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F8DDBB46-7ACE-4C13-91B4-FFB7E93363D9}
diff --git a/src/libraries/System.IO.Packaging/System.IO.Packaging.sln b/src/libraries/System.IO.Packaging/System.IO.Packaging.sln
index 8d5ff20ef65a3..b0b39fab29760 100644
--- a/src/libraries/System.IO.Packaging/System.IO.Packaging.sln
+++ b/src/libraries/System.IO.Packaging/System.IO.Packaging.sln
@@ -7,12 +7,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Packaging", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Packaging.Tests", "tests\System.IO.Packaging.Tests.csproj", "{588B83D6-132B-4399-B31E-4B40CD9CCAE6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{93D098C7-7786-4B42-BAB3-36AE50C6241A}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{E58B740D-A353-4D96-857F-0C6898A0BAAB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{5C4BD3D4-565A-4DB3-9AA7-13C0D52B1EE0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{030B7BEE-4BBF-4DDC-B78B-8E9B580E76E9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{881F49D0-05B7-4D4C-9E06-C13F5A3B64B7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{D91D128B-CF60-4E10-9904-02C2E3470BF3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{1433AE94-C1FE-4698-9EEE-4CD819631F51}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{FFA44787-1321-479E-A6D2-BD9443A42457}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CDE13DDC-F9E2-4C5F-9379-26E3273B7270}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A31F533C-5EA6-4E97-91B1-C298BE0060E0}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A767928D-1A4
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{89942E1D-4F98-4CEF-B275-8A30127462BE}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{1B2237D8-B3D9-4C88-80C0-35893455C02B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{6EDFBC48-78B9-4159-A450-C5303530F114}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C2A60053-E75F-4255-BF07-4F5C2213FC6C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{7C1E951C-EF1F-4B0C-9B10-423A4B4776D6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{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
-		{93D098C7-7786-4B42-BAB3-36AE50C6241A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{93D098C7-7786-4B42-BAB3-36AE50C6241A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{93D098C7-7786-4B42-BAB3-36AE50C6241A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{93D098C7-7786-4B42-BAB3-36AE50C6241A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E58B740D-A353-4D96-857F-0C6898A0BAAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E58B740D-A353-4D96-857F-0C6898A0BAAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E58B740D-A353-4D96-857F-0C6898A0BAAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{5C4BD3D4-565A-4DB3-9AA7-13C0D52B1EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5C4BD3D4-565A-4DB3-9AA7-13C0D52B1EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5C4BD3D4-565A-4DB3-9AA7-13C0D52B1EE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{030B7BEE-4BBF-4DDC-B78B-8E9B580E76E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{030B7BEE-4BBF-4DDC-B78B-8E9B580E76E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{030B7BEE-4BBF-4DDC-B78B-8E9B580E76E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{030B7BEE-4BBF-4DDC-B78B-8E9B580E76E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{881F49D0-05B7-4D4C-9E06-C13F5A3B64B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{881F49D0-05B7-4D4C-9E06-C13F5A3B64B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{881F49D0-05B7-4D4C-9E06-C13F5A3B64B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{881F49D0-05B7-4D4C-9E06-C13F5A3B64B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D91D128B-CF60-4E10-9904-02C2E3470BF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D91D128B-CF60-4E10-9904-02C2E3470BF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D91D128B-CF60-4E10-9904-02C2E3470BF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D91D128B-CF60-4E10-9904-02C2E3470BF3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1433AE94-C1FE-4698-9EEE-4CD819631F51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1433AE94-C1FE-4698-9EEE-4CD819631F51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1433AE94-C1FE-4698-9EEE-4CD819631F51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1433AE94-C1FE-4698-9EEE-4CD819631F51}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FFA44787-1321-479E-A6D2-BD9443A42457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFA44787-1321-479E-A6D2-BD9443A42457}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FFA44787-1321-479E-A6D2-BD9443A42457}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FFA44787-1321-479E-A6D2-BD9443A42457}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,9 +96,16 @@ Global
 		{588B83D6-132B-4399-B31E-4B40CD9CCAE6} = {CDE13DDC-F9E2-4C5F-9379-26E3273B7270}
 		{6EF662E4-9A1E-4DAC-A04B-A1461BB6CA28} = {A31F533C-5EA6-4E97-91B1-C298BE0060E0}
 		{C553FA20-C4C0-48A2-B841-12F2F860E21F} = {A767928D-1A4C-4513-9FF6-CB395D45B6A8}
-		{93D098C7-7786-4B42-BAB3-36AE50C6241A} = {89942E1D-4F98-4CEF-B275-8A30127462BE}
 		{E58B740D-A353-4D96-857F-0C6898A0BAAB} = {89942E1D-4F98-4CEF-B275-8A30127462BE}
 		{5C4BD3D4-565A-4DB3-9AA7-13C0D52B1EE0} = {89942E1D-4F98-4CEF-B275-8A30127462BE}
+		{030B7BEE-4BBF-4DDC-B78B-8E9B580E76E9} = {1B2237D8-B3D9-4C88-80C0-35893455C02B}
+		{881F49D0-05B7-4D4C-9E06-C13F5A3B64B7} = {1B2237D8-B3D9-4C88-80C0-35893455C02B}
+		{1B2237D8-B3D9-4C88-80C0-35893455C02B} = {7C1E951C-EF1F-4B0C-9B10-423A4B4776D6}
+		{D91D128B-CF60-4E10-9904-02C2E3470BF3} = {6EDFBC48-78B9-4159-A450-C5303530F114}
+		{1433AE94-C1FE-4698-9EEE-4CD819631F51} = {6EDFBC48-78B9-4159-A450-C5303530F114}
+		{6EDFBC48-78B9-4159-A450-C5303530F114} = {7C1E951C-EF1F-4B0C-9B10-423A4B4776D6}
+		{FFA44787-1321-479E-A6D2-BD9443A42457} = {C2A60053-E75F-4255-BF07-4F5C2213FC6C}
+		{C2A60053-E75F-4255-BF07-4F5C2213FC6C} = {7C1E951C-EF1F-4B0C-9B10-423A4B4776D6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8F459277-2162-4A3B-BB19-29D4292EFC1F}
diff --git a/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln b/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln
index 73fd1d07e27e2..e5ed8ed948abb 100644
--- a/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln
+++ b/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln
@@ -9,12 +9,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines.Tests", "tests\System.IO.Pipelines.Tests.csproj", "{1B97BE49-ACAD-4DC9-B195-FE23C3DE5D08}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{7920EFCD-4320-4B04-84C8-83E3D22505FF}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{EB66BC9F-8895-494C-81CD-5F64A7DA1D4D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1A609A5A-8D99-4849-AF21-BB7510070C49}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{364A0F25-54E3-4B0B-A2E9-123621F19374}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{48BF97DB-A17B-4A8A-9EC4-1650B5517789}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{554C5C3B-D6A5-43E1-B4CE-8FEEF9CF6A39}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{E05F2E14-1217-442F-8F37-8D270B4E5144}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{66B1776B-73F3-4711-976C-5DCE394FBC5E}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6FCDC00D-202F-4BFE-B799-DFD3F2E8F44D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BC2B926D-1416-4330-A62B-EC48667E0E7B}"
@@ -23,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0F960DB3-8D8
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{68B6BB77-1325-4BD7-95B1-67ECA89889E8}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{826BB2FE-0019-4404-A783-6381E099773C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{13357657-3D6F-4C5B-B8B9-10DDA9DED683}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{BEE6D12B-050E-42FD-B159-28FA599D6A01}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{3B96876A-3995-4F54-BE6A-CEBA84A12D0A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -49,10 +65,6 @@ Global
 		{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
-		{7920EFCD-4320-4B04-84C8-83E3D22505FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7920EFCD-4320-4B04-84C8-83E3D22505FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7920EFCD-4320-4B04-84C8-83E3D22505FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7920EFCD-4320-4B04-84C8-83E3D22505FF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EB66BC9F-8895-494C-81CD-5F64A7DA1D4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EB66BC9F-8895-494C-81CD-5F64A7DA1D4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EB66BC9F-8895-494C-81CD-5F64A7DA1D4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,6 +73,26 @@ Global
 		{1A609A5A-8D99-4849-AF21-BB7510070C49}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1A609A5A-8D99-4849-AF21-BB7510070C49}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1A609A5A-8D99-4849-AF21-BB7510070C49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{364A0F25-54E3-4B0B-A2E9-123621F19374}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{364A0F25-54E3-4B0B-A2E9-123621F19374}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{364A0F25-54E3-4B0B-A2E9-123621F19374}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{364A0F25-54E3-4B0B-A2E9-123621F19374}.Release|Any CPU.Build.0 = Release|Any CPU
+		{48BF97DB-A17B-4A8A-9EC4-1650B5517789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48BF97DB-A17B-4A8A-9EC4-1650B5517789}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48BF97DB-A17B-4A8A-9EC4-1650B5517789}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{48BF97DB-A17B-4A8A-9EC4-1650B5517789}.Release|Any CPU.Build.0 = Release|Any CPU
+		{554C5C3B-D6A5-43E1-B4CE-8FEEF9CF6A39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{554C5C3B-D6A5-43E1-B4CE-8FEEF9CF6A39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{554C5C3B-D6A5-43E1-B4CE-8FEEF9CF6A39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{554C5C3B-D6A5-43E1-B4CE-8FEEF9CF6A39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E05F2E14-1217-442F-8F37-8D270B4E5144}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E05F2E14-1217-442F-8F37-8D270B4E5144}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E05F2E14-1217-442F-8F37-8D270B4E5144}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E05F2E14-1217-442F-8F37-8D270B4E5144}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66B1776B-73F3-4711-976C-5DCE394FBC5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66B1776B-73F3-4711-976C-5DCE394FBC5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66B1776B-73F3-4711-976C-5DCE394FBC5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66B1776B-73F3-4711-976C-5DCE394FBC5E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -71,9 +103,16 @@ Global
 		{1B97BE49-ACAD-4DC9-B195-FE23C3DE5D08} = {6FCDC00D-202F-4BFE-B799-DFD3F2E8F44D}
 		{DC148B85-05DB-43B2-B2AF-958C305C2C0A} = {BC2B926D-1416-4330-A62B-EC48667E0E7B}
 		{1DD520A2-ED75-4889-848E-DBDC7BE41873} = {0F960DB3-8D87-4D62-BF68-75299FED62F7}
-		{7920EFCD-4320-4B04-84C8-83E3D22505FF} = {68B6BB77-1325-4BD7-95B1-67ECA89889E8}
 		{EB66BC9F-8895-494C-81CD-5F64A7DA1D4D} = {68B6BB77-1325-4BD7-95B1-67ECA89889E8}
 		{1A609A5A-8D99-4849-AF21-BB7510070C49} = {68B6BB77-1325-4BD7-95B1-67ECA89889E8}
+		{364A0F25-54E3-4B0B-A2E9-123621F19374} = {826BB2FE-0019-4404-A783-6381E099773C}
+		{48BF97DB-A17B-4A8A-9EC4-1650B5517789} = {826BB2FE-0019-4404-A783-6381E099773C}
+		{826BB2FE-0019-4404-A783-6381E099773C} = {3B96876A-3995-4F54-BE6A-CEBA84A12D0A}
+		{554C5C3B-D6A5-43E1-B4CE-8FEEF9CF6A39} = {13357657-3D6F-4C5B-B8B9-10DDA9DED683}
+		{E05F2E14-1217-442F-8F37-8D270B4E5144} = {13357657-3D6F-4C5B-B8B9-10DDA9DED683}
+		{13357657-3D6F-4C5B-B8B9-10DDA9DED683} = {3B96876A-3995-4F54-BE6A-CEBA84A12D0A}
+		{66B1776B-73F3-4711-976C-5DCE394FBC5E} = {BEE6D12B-050E-42FD-B159-28FA599D6A01}
+		{BEE6D12B-050E-42FD-B159-28FA599D6A01} = {3B96876A-3995-4F54-BE6A-CEBA84A12D0A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2034EAE9-84E4-42C3-8C1F-AB515D313D5E}
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 899da879c0525..9e3ced82944d9 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
@@ -27,6 +27,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims", ".
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{F04E416F-8A9C-4670-BE1E-22E5D7E7209F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{3922D31C-0F73-4E87-BE10-72BF6AF73494}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{B358C598-E691-473A-957C-C93C94A8BA21}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{CE6136ED-5D01-451A-8AA2-46D92936FCA6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{C456C00D-7215-4968-8104-74508F29F1B4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A138BEEF-C1D2-4204-A1CE-E02CB6A7E2A9}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E1F66F1E-923F-4B07-A1E9-3F1BB01F221A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ADDC6FEE-EDF2-4EAD-B802-1BCF686E0D71}"
@@ -35,6 +45,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F8E1D6D4-F8B
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{EB85C209-FC5D-455A-8BFE-E7B0D9CC48E8}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{BF96303B-6A5C-4F00-B364-8F8ED50D1C75}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{EA0E381E-0C3E-4EDB-809B-A98F8EB30C98}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{4DDE06DC-923D-4CD7-B4B2-D02D57282585}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{DC0128DE-CF85-4E7C-B6E2-B405CBEB41F1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +115,26 @@ Global
 		{F04E416F-8A9C-4670-BE1E-22E5D7E7209F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F04E416F-8A9C-4670-BE1E-22E5D7E7209F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F04E416F-8A9C-4670-BE1E-22E5D7E7209F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3922D31C-0F73-4E87-BE10-72BF6AF73494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3922D31C-0F73-4E87-BE10-72BF6AF73494}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3922D31C-0F73-4E87-BE10-72BF6AF73494}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3922D31C-0F73-4E87-BE10-72BF6AF73494}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B358C598-E691-473A-957C-C93C94A8BA21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B358C598-E691-473A-957C-C93C94A8BA21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B358C598-E691-473A-957C-C93C94A8BA21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B358C598-E691-473A-957C-C93C94A8BA21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE6136ED-5D01-451A-8AA2-46D92936FCA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE6136ED-5D01-451A-8AA2-46D92936FCA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE6136ED-5D01-451A-8AA2-46D92936FCA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE6136ED-5D01-451A-8AA2-46D92936FCA6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C456C00D-7215-4968-8104-74508F29F1B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C456C00D-7215-4968-8104-74508F29F1B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C456C00D-7215-4968-8104-74508F29F1B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C456C00D-7215-4968-8104-74508F29F1B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A138BEEF-C1D2-4204-A1CE-E02CB6A7E2A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A138BEEF-C1D2-4204-A1CE-E02CB6A7E2A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A138BEEF-C1D2-4204-A1CE-E02CB6A7E2A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A138BEEF-C1D2-4204-A1CE-E02CB6A7E2A9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -116,6 +154,14 @@ Global
 		{E49FBD77-BB9C-4912-99F8-9E8DB0D17A35} = {EB85C209-FC5D-455A-8BFE-E7B0D9CC48E8}
 		{49F9208B-CEFC-402E-815C-2CF64FD0C85C} = {EB85C209-FC5D-455A-8BFE-E7B0D9CC48E8}
 		{123AF6E1-60BF-4360-9010-885AB140205F} = {EB85C209-FC5D-455A-8BFE-E7B0D9CC48E8}
+		{3922D31C-0F73-4E87-BE10-72BF6AF73494} = {BF96303B-6A5C-4F00-B364-8F8ED50D1C75}
+		{B358C598-E691-473A-957C-C93C94A8BA21} = {BF96303B-6A5C-4F00-B364-8F8ED50D1C75}
+		{BF96303B-6A5C-4F00-B364-8F8ED50D1C75} = {DC0128DE-CF85-4E7C-B6E2-B405CBEB41F1}
+		{CE6136ED-5D01-451A-8AA2-46D92936FCA6} = {EA0E381E-0C3E-4EDB-809B-A98F8EB30C98}
+		{C456C00D-7215-4968-8104-74508F29F1B4} = {EA0E381E-0C3E-4EDB-809B-A98F8EB30C98}
+		{EA0E381E-0C3E-4EDB-809B-A98F8EB30C98} = {DC0128DE-CF85-4E7C-B6E2-B405CBEB41F1}
+		{A138BEEF-C1D2-4204-A1CE-E02CB6A7E2A9} = {4DDE06DC-923D-4CD7-B4B2-D02D57282585}
+		{4DDE06DC-923D-4CD7-B4B2-D02D57282585} = {DC0128DE-CF85-4E7C-B6E2-B405CBEB41F1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A148100C-0767-46F2-99CB-3AF298DD788F}
diff --git a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln
index aec405954f758..1ba746b56d2c8 100644
--- a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln
+++ b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln
@@ -1,8 +1,12 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamConformanceTests", "..\Common\tests\StreamConformanceTests\StreamConformanceTests.csproj", "{9220284A-2366-43C3-8ED0-D6ED46EC8175}"
 EndProject
 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.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{8D254FBD-C46E-4701-B2B5-238CABBE81F8}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\ref\System.Configuration.ConfigurationManager.csproj", "{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj", "{FED8B31F-94BB-48AF-9A0A-03C777BD805B}"
@@ -31,6 +35,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes", "src\Syst
 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.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{B5971A04-44AC-404D-8A58-F85C61F53244}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{A7AC5643-2743-47AC-9284-718EB5466963}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}"
@@ -39,6 +49,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{6B552ED6-CA18-4048-8BDB-2B4A09020694}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}"
+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}"
@@ -51,142 +63,849 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{78D8A09F-59F1-4F02-8FA9-14243A052080}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{965BE455-6D8C-43F7-9C0F-22C223D680ED}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B64B7581-6925-4823-B7AF-97FBC53A4146}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{865F846B-B958-4546-9AAA-557FFED6D419}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{305B75AF-BAB0-47FF-AB8A-29D65082C471}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{16A18208-CD5B-4490-866D-F3CD25D8CF76}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{2271988B-3D42-40FD-A57F-296AB05E15B6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{78D8A09F-59F1-4F02-8FA9-14243A052080}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B90127A0-E005-44FE-9D2B-3DE06444CE37}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B64B7581-6925-4823-B7AF-97FBC53A4146}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{FE4693B5-3585-4555-BABA-A8BE2AA9C85E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{022B84D6-4F09-4371-9611-16DC2C968CBF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{4C115EF8-1A92-4A88-9A3A-BDBD561ED6B7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{31FC6408-1E21-4331-B049-3202DEEFB1FC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{D650D56D-B099-40A3-B28D-057CA9FD5574}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm = Debug|arm
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm = Release|arm
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Debug|Any CPU.Build.0 = Debug|x64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Debug|arm.ActiveCfg = Debug|arm
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Debug|arm.Build.0 = Debug|arm
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Debug|arm64.ActiveCfg = Debug|arm64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Debug|arm64.Build.0 = Debug|arm64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Debug|x64.ActiveCfg = Debug|x64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Debug|x64.Build.0 = Debug|x64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Debug|x86.ActiveCfg = Debug|x86
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Debug|x86.Build.0 = Debug|x86
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Release|Any CPU.ActiveCfg = Release|x64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Release|Any CPU.Build.0 = Release|x64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Release|arm.ActiveCfg = Release|arm
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Release|arm.Build.0 = Release|arm
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Release|arm64.ActiveCfg = Release|arm64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Release|arm64.Build.0 = Release|arm64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Release|x64.ActiveCfg = Release|x64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Release|x64.Build.0 = Release|x64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Release|x86.ActiveCfg = Release|x86
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Release|x86.Build.0 = Release|x86
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Checked|Any CPU.Build.0 = Checked|x64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Checked|arm.ActiveCfg = Checked|arm
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Checked|arm.Build.0 = Checked|arm
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Checked|arm64.ActiveCfg = Checked|arm64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Checked|arm64.Build.0 = Checked|arm64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Checked|x64.ActiveCfg = Checked|x64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Checked|x64.Build.0 = Checked|x64
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Checked|x86.ActiveCfg = Checked|x86
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1}.Checked|x86.Build.0 = Checked|x86
 		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Debug|x64.Build.0 = Debug|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Debug|x86.Build.0 = Debug|Any CPU
 		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Release|arm.ActiveCfg = Release|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Release|x64.ActiveCfg = Release|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Release|x64.Build.0 = Release|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Release|x86.ActiveCfg = Release|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Release|x86.Build.0 = Release|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9220284A-2366-43C3-8ED0-D6ED46EC8175}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Debug|x64.Build.0 = Debug|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Debug|x86.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
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Release|arm.ActiveCfg = Release|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Release|x64.ActiveCfg = Release|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Release|x64.Build.0 = Release|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Release|x86.ActiveCfg = Release|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Release|x86.Build.0 = Release|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Debug|x64.Build.0 = Debug|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Debug|x86.Build.0 = Debug|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Release|arm.ActiveCfg = Release|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Release|x64.ActiveCfg = Release|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Release|x64.Build.0 = Release|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Release|x86.ActiveCfg = Release|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Release|x86.Build.0 = Release|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Debug|x64.Build.0 = Debug|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Debug|x86.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
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Release|arm.ActiveCfg = Release|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Release|arm64.ActiveCfg = Release|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Release|x64.ActiveCfg = Release|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Release|x64.Build.0 = Release|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Release|x86.ActiveCfg = Release|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Release|x86.Build.0 = Release|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Debug|x64.Build.0 = Debug|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Debug|x86.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
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Release|arm.ActiveCfg = Release|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Release|x64.ActiveCfg = Release|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Release|x64.Build.0 = Release|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Release|x86.ActiveCfg = Release|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Release|x86.Build.0 = Release|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{616A1164-8B49-42C1-BD86-F416B47F7543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{616A1164-8B49-42C1-BD86-F416B47F7543}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Debug|x64.Build.0 = Debug|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Debug|x86.Build.0 = Debug|Any CPU
 		{616A1164-8B49-42C1-BD86-F416B47F7543}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{616A1164-8B49-42C1-BD86-F416B47F7543}.Release|Any CPU.Build.0 = Release|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Release|arm.ActiveCfg = Release|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Release|arm64.ActiveCfg = Release|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Release|x64.ActiveCfg = Release|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Release|x64.Build.0 = Release|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Release|x86.ActiveCfg = Release|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Release|x86.Build.0 = Release|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{616A1164-8B49-42C1-BD86-F416B47F7543}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Debug|x64.Build.0 = Debug|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Debug|x86.Build.0 = Debug|Any CPU
 		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Release|arm.ActiveCfg = Release|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Release|x64.ActiveCfg = Release|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Release|x64.Build.0 = Release|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Release|x86.ActiveCfg = Release|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Release|x86.Build.0 = Release|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Debug|x64.Build.0 = Debug|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Debug|x86.Build.0 = Debug|Any CPU
 		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Release|arm.ActiveCfg = Release|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Release|x64.ActiveCfg = Release|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Release|x64.Build.0 = Release|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Release|x86.ActiveCfg = Release|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Release|x86.Build.0 = Release|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1EE276D5-2F82-4D93-9E35-33A26022AB6D}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Debug|x64.Build.0 = Debug|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Debug|x86.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
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Release|arm.ActiveCfg = Release|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Release|x64.ActiveCfg = Release|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Release|x64.Build.0 = Release|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Release|x86.ActiveCfg = Release|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Release|x86.Build.0 = Release|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Debug|x64.Build.0 = Debug|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Debug|x86.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
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Release|arm.ActiveCfg = Release|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Release|x64.ActiveCfg = Release|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Release|x64.Build.0 = Release|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Release|x86.ActiveCfg = Release|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Release|x86.Build.0 = Release|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Debug|x64.Build.0 = Debug|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Debug|x86.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
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Release|arm.ActiveCfg = Release|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Release|arm64.ActiveCfg = Release|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Release|x64.ActiveCfg = Release|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Release|x64.Build.0 = Release|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Release|x86.ActiveCfg = Release|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Release|x86.Build.0 = Release|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Debug|x64.Build.0 = Debug|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Debug|x86.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
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Release|arm.ActiveCfg = Release|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Release|arm64.ActiveCfg = Release|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Release|x64.ActiveCfg = Release|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Release|x64.Build.0 = Release|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Release|x86.ActiveCfg = Release|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Release|x86.Build.0 = Release|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Debug|x64.Build.0 = Debug|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Debug|x86.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
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Release|arm.ActiveCfg = Release|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Release|x64.ActiveCfg = Release|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Release|x64.Build.0 = Release|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Release|x86.ActiveCfg = Release|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Release|x86.Build.0 = Release|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Debug|x64.Build.0 = Debug|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Debug|x86.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
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Release|arm.ActiveCfg = Release|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Release|x64.ActiveCfg = Release|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Release|x64.Build.0 = Release|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Release|x86.ActiveCfg = Release|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Release|x86.Build.0 = Release|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Debug|x64.Build.0 = Debug|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Debug|x86.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
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Release|arm.ActiveCfg = Release|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Release|x64.ActiveCfg = Release|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Release|x64.Build.0 = Release|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Release|x86.ActiveCfg = Release|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Release|x86.Build.0 = Release|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Debug|x64.Build.0 = Debug|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Debug|x86.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
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Release|arm.ActiveCfg = Release|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Release|x64.ActiveCfg = Release|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Release|x64.Build.0 = Release|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Release|x86.ActiveCfg = Release|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Release|x86.Build.0 = Release|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Debug|x64.Build.0 = Debug|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Debug|x86.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
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Release|arm.ActiveCfg = Release|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Release|x64.ActiveCfg = Release|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Release|x64.Build.0 = Release|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Release|x86.ActiveCfg = Release|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Release|x86.Build.0 = Release|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Debug|x64.Build.0 = Debug|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Debug|x86.Build.0 = Debug|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Release|arm.ActiveCfg = Release|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Release|x64.ActiveCfg = Release|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Release|x64.Build.0 = Release|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Release|x86.ActiveCfg = Release|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Release|x86.Build.0 = Release|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B5971A04-44AC-404D-8A58-F85C61F53244}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Debug|x64.Build.0 = Debug|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Debug|x86.Build.0 = Debug|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Release|arm.ActiveCfg = Release|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Release|x64.ActiveCfg = Release|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Release|x64.Build.0 = Release|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Release|x86.ActiveCfg = Release|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Release|x86.Build.0 = Release|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Debug|x64.Build.0 = Debug|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Debug|x86.Build.0 = Debug|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Release|arm.ActiveCfg = Release|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Release|x64.ActiveCfg = Release|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Release|x64.Build.0 = Release|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Release|x86.ActiveCfg = Release|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Release|x86.Build.0 = Release|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{A7AC5643-2743-47AC-9284-718EB5466963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A7AC5643-2743-47AC-9284-718EB5466963}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Debug|x64.Build.0 = Debug|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Debug|x86.Build.0 = Debug|Any CPU
 		{A7AC5643-2743-47AC-9284-718EB5466963}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A7AC5643-2743-47AC-9284-718EB5466963}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Release|arm.ActiveCfg = Release|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Release|x64.ActiveCfg = Release|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Release|x64.Build.0 = Release|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Release|x86.ActiveCfg = Release|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Release|x86.Build.0 = Release|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A7AC5643-2743-47AC-9284-718EB5466963}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Debug|x64.Build.0 = Debug|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Debug|x86.Build.0 = Debug|Any CPU
 		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Release|arm.ActiveCfg = Release|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Release|x64.ActiveCfg = Release|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Release|x64.Build.0 = Release|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Release|x86.ActiveCfg = Release|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Release|x86.Build.0 = Release|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Debug|x64.Build.0 = Debug|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Debug|x86.Build.0 = Debug|Any CPU
 		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Release|arm.ActiveCfg = Release|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Release|x64.ActiveCfg = Release|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Release|x64.Build.0 = Release|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Release|x86.ActiveCfg = Release|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Release|x86.Build.0 = Release|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Debug|x64.Build.0 = Debug|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Debug|x86.Build.0 = Debug|Any CPU
 		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Release|arm.ActiveCfg = Release|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Release|x64.ActiveCfg = Release|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Release|x64.Build.0 = Release|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Release|x86.ActiveCfg = Release|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Release|x86.Build.0 = Release|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Debug|x64.Build.0 = Debug|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Debug|x86.Build.0 = Debug|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Release|arm.ActiveCfg = Release|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Release|x64.ActiveCfg = Release|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Release|x64.Build.0 = Release|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Release|x86.ActiveCfg = Release|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Release|x86.Build.0 = Release|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Debug|x64.Build.0 = Debug|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Debug|x86.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
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Release|arm.ActiveCfg = Release|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Release|x64.ActiveCfg = Release|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Release|x64.Build.0 = Release|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Release|x86.ActiveCfg = Release|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Release|x86.Build.0 = Release|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Debug|x64.Build.0 = Debug|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Debug|x86.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
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Release|arm.ActiveCfg = Release|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Release|x64.ActiveCfg = Release|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Release|x64.Build.0 = Release|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Release|x86.ActiveCfg = Release|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Release|x86.Build.0 = Release|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Debug|x64.Build.0 = Debug|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Debug|x86.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
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Release|arm.ActiveCfg = Release|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Release|x64.ActiveCfg = Release|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Release|x64.Build.0 = Release|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Release|x86.ActiveCfg = Release|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Release|x86.Build.0 = Release|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Debug|x64.Build.0 = Debug|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Debug|x86.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
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Release|arm.ActiveCfg = Release|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Release|x64.ActiveCfg = Release|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Release|x64.Build.0 = Release|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Release|x86.ActiveCfg = Release|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Release|x86.Build.0 = Release|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Debug|x64.Build.0 = Debug|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Debug|x86.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
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Release|arm.ActiveCfg = Release|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Release|x64.ActiveCfg = Release|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Release|x64.Build.0 = Release|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Release|x86.ActiveCfg = Release|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Release|x86.Build.0 = Release|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Debug|x64.Build.0 = Debug|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Debug|x86.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
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Release|arm.ActiveCfg = Release|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Release|x64.ActiveCfg = Release|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Release|x64.Build.0 = Release|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Release|x86.ActiveCfg = Release|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Release|x86.Build.0 = Release|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Debug|x64.Build.0 = Debug|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Debug|x86.Build.0 = Debug|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Release|arm.ActiveCfg = Release|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Release|arm64.ActiveCfg = Release|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Release|x64.ActiveCfg = Release|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Release|x64.Build.0 = Release|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Release|x86.ActiveCfg = Release|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Release|x86.Build.0 = Release|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Debug|x64.Build.0 = Debug|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Debug|x86.Build.0 = Debug|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Release|Any CPU.Build.0 = Release|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Release|arm.ActiveCfg = Release|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Release|arm64.ActiveCfg = Release|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Release|x64.ActiveCfg = Release|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Release|x64.Build.0 = Release|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Release|x86.ActiveCfg = Release|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Release|x86.Build.0 = Release|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{865F846B-B958-4546-9AAA-557FFED6D419}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Debug|x64.Build.0 = Debug|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Debug|x86.Build.0 = Debug|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Release|arm.ActiveCfg = Release|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Release|x64.ActiveCfg = Release|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Release|x64.Build.0 = Release|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Release|x86.ActiveCfg = Release|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Release|x86.Build.0 = Release|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Debug|x64.Build.0 = Debug|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Debug|x86.Build.0 = Debug|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Release|Any CPU.Build.0 = Release|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Release|arm.ActiveCfg = Release|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Release|arm64.ActiveCfg = Release|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Release|x64.ActiveCfg = Release|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Release|x64.Build.0 = Release|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Release|x86.ActiveCfg = Release|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Release|x86.Build.0 = Release|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Debug|x64.Build.0 = Debug|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Debug|x86.Build.0 = Debug|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Release|arm.ActiveCfg = Release|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Release|arm64.ActiveCfg = Release|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Release|x64.ActiveCfg = Release|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Release|x64.Build.0 = Release|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Release|x86.ActiveCfg = Release|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Release|x86.Build.0 = Release|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1} = {2271988B-3D42-40FD-A57F-296AB05E15B6}
 		{9220284A-2366-43C3-8ED0-D6ED46EC8175} = {78D8A09F-59F1-4F02-8FA9-14243A052080}
 		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B} = {78D8A09F-59F1-4F02-8FA9-14243A052080}
 		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC} = {78D8A09F-59F1-4F02-8FA9-14243A052080}
-		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
-		{616A1164-8B49-42C1-BD86-F416B47F7543} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
-		{9A567CB8-B318-42C0-B05F-B0746E50DBFD} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
-		{572E9C48-D5F4-4D27-825F-6BBC504E9526} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
-		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
-		{53D35175-9799-4535-8322-88BF2FCDD56E} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
-		{6B552ED6-CA18-4048-8BDB-2B4A09020694} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
-		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
-		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
-		{724E9C4C-A140-4815-88A4-2934BD67574F} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
+		{8D254FBD-C46E-4701-B2B5-238CABBE81F8} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
 		{FED8B31F-94BB-48AF-9A0A-03C777BD805B} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
 		{F97B792B-B1B0-47B5-BC93-72FCD6E0BD93} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
 		{1EE276D5-2F82-4D93-9E35-33A26022AB6D} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
@@ -194,12 +913,34 @@ Global
 		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
 		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
 		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
+		{7E7268D8-64E0-4CA6-9B1F-2ABA08E55120} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
+		{9CB4F5E5-8265-41EA-BB1B-EF4D2724DF9E} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
 		{E565DD4A-0749-4F5E-8476-EF44D742E377} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
 		{15CB5F16-593B-460D-BDC3-134A56EF3B5F} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
 		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
+		{616A1164-8B49-42C1-BD86-F416B47F7543} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
+		{53D35175-9799-4535-8322-88BF2FCDD56E} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
+		{D3BFDA30-F3AA-4BD9-87CB-F030559B8730} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
+		{6B552ED6-CA18-4048-8BDB-2B4A09020694} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
+		{724E9C4C-A140-4815-88A4-2934BD67574F} = {B64B7581-6925-4823-B7AF-97FBC53A4146}
+		{B5971A04-44AC-404D-8A58-F85C61F53244} = {FE4693B5-3585-4555-BABA-A8BE2AA9C85E}
 		{A7AC5643-2743-47AC-9284-718EB5466963} = {FE4693B5-3585-4555-BABA-A8BE2AA9C85E}
 		{C1B1DCD9-30B9-4E17-A049-A04DCED30D14} = {FE4693B5-3585-4555-BABA-A8BE2AA9C85E}
 		{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA} = {FE4693B5-3585-4555-BABA-A8BE2AA9C85E}
+		{965BE455-6D8C-43F7-9C0F-22C223D680ED} = {022B84D6-4F09-4371-9611-16DC2C968CBF}
+		{865F846B-B958-4546-9AAA-557FFED6D419} = {022B84D6-4F09-4371-9611-16DC2C968CBF}
+		{022B84D6-4F09-4371-9611-16DC2C968CBF} = {D650D56D-B099-40A3-B28D-057CA9FD5574}
+		{A500EDDF-AAD0-4486-A2EB-E4A78AE58707} = {4C115EF8-1A92-4A88-9A3A-BDBD561ED6B7}
+		{305B75AF-BAB0-47FF-AB8A-29D65082C471} = {4C115EF8-1A92-4A88-9A3A-BDBD561ED6B7}
+		{4C115EF8-1A92-4A88-9A3A-BDBD561ED6B7} = {D650D56D-B099-40A3-B28D-057CA9FD5574}
+		{16A18208-CD5B-4490-866D-F3CD25D8CF76} = {31FC6408-1E21-4331-B049-3202DEEFB1FC}
+		{31FC6408-1E21-4331-B049-3202DEEFB1FC} = {D650D56D-B099-40A3-B28D-057CA9FD5574}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CD1065BC-8D4A-4559-BC8B-8FB6B73A6B15}
diff --git a/src/libraries/System.IO.Ports/System.IO.Ports.sln b/src/libraries/System.IO.Ports/System.IO.Ports.sln
index 2c0b1160aa27b..bd649a47b35c3 100644
--- a/src/libraries/System.IO.Ports/System.IO.Ports.sln
+++ b/src/libraries/System.IO.Ports/System.IO.Ports.sln
@@ -31,6 +31,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePa
 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}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{3A90724E-B199-4B0A-BB38-FA926A100A6A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{08288D42-25D1-49AB-808C-D1EA8F1D850E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{082FDAE8-0C3B-49CA-8D09-FC7ADE9D9651}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{CD819A22-8584-4A91-A23C-7EC7F950859D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{3D5CF06F-ACA2-4567-9C40-1D08B11B7D5B}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D5326A44-B098-41AB-8EEC-0492DC64E610}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F3F3FD18-CF31-4E24-9BBD-5303D38CF86B}"
@@ -39,6 +49,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{88B0C0E7-B79
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B86A1AC4-AE98-45BB-8548-2C369188D58A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{B33FCFE9-427F-4E06-BE22-E168E76CF56C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{B0596714-2213-4A7C-9AB6-9D233E5B87C4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{39C00986-62EE-4BAB-9C1E-78A7B082FA5F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{8C3AAE7B-9E0C-481E-93D5-DB4745348159}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -109,6 +127,26 @@ Global
 		{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
+		{3A90724E-B199-4B0A-BB38-FA926A100A6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A90724E-B199-4B0A-BB38-FA926A100A6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A90724E-B199-4B0A-BB38-FA926A100A6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A90724E-B199-4B0A-BB38-FA926A100A6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08288D42-25D1-49AB-808C-D1EA8F1D850E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08288D42-25D1-49AB-808C-D1EA8F1D850E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08288D42-25D1-49AB-808C-D1EA8F1D850E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08288D42-25D1-49AB-808C-D1EA8F1D850E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{082FDAE8-0C3B-49CA-8D09-FC7ADE9D9651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{082FDAE8-0C3B-49CA-8D09-FC7ADE9D9651}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{082FDAE8-0C3B-49CA-8D09-FC7ADE9D9651}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{082FDAE8-0C3B-49CA-8D09-FC7ADE9D9651}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD819A22-8584-4A91-A23C-7EC7F950859D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD819A22-8584-4A91-A23C-7EC7F950859D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD819A22-8584-4A91-A23C-7EC7F950859D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD819A22-8584-4A91-A23C-7EC7F950859D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D5CF06F-ACA2-4567-9C40-1D08B11B7D5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D5CF06F-ACA2-4567-9C40-1D08B11B7D5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D5CF06F-ACA2-4567-9C40-1D08B11B7D5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D5CF06F-ACA2-4567-9C40-1D08B11B7D5B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -130,6 +168,14 @@ Global
 		{28396A85-9215-4366-A582-B03BB13A60DD} = {B86A1AC4-AE98-45BB-8548-2C369188D58A}
 		{AAB67274-550C-40C2-92EA-38C12CC2060F} = {B86A1AC4-AE98-45BB-8548-2C369188D58A}
 		{094F1156-D8B8-420C-945C-B74E1454B6E5} = {B86A1AC4-AE98-45BB-8548-2C369188D58A}
+		{3A90724E-B199-4B0A-BB38-FA926A100A6A} = {B33FCFE9-427F-4E06-BE22-E168E76CF56C}
+		{08288D42-25D1-49AB-808C-D1EA8F1D850E} = {B33FCFE9-427F-4E06-BE22-E168E76CF56C}
+		{B33FCFE9-427F-4E06-BE22-E168E76CF56C} = {8C3AAE7B-9E0C-481E-93D5-DB4745348159}
+		{082FDAE8-0C3B-49CA-8D09-FC7ADE9D9651} = {B0596714-2213-4A7C-9AB6-9D233E5B87C4}
+		{CD819A22-8584-4A91-A23C-7EC7F950859D} = {B0596714-2213-4A7C-9AB6-9D233E5B87C4}
+		{B0596714-2213-4A7C-9AB6-9D233E5B87C4} = {8C3AAE7B-9E0C-481E-93D5-DB4745348159}
+		{3D5CF06F-ACA2-4567-9C40-1D08B11B7D5B} = {39C00986-62EE-4BAB-9C1E-78A7B082FA5F}
+		{39C00986-62EE-4BAB-9C1E-78A7B082FA5F} = {8C3AAE7B-9E0C-481E-93D5-DB4745348159}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {54136FEA-7C5B-41E5-86EE-C5816F222DEE}
diff --git a/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln b/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln
index f299179629a14..1bdc4666d585d 100644
--- a/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln
+++ b/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln
@@ -17,6 +17,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{F4BB7D19-A456-41DE-9A65-7876A2EF00D9}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{681196A9-9EEC-42BC-AC89-612B56FEFDC0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{63A59D01-FA16-4F20-B4CB-97B2B78F4307}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{DB256F88-F5A2-4576-B279-D52A89E29644}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{3070F484-7EA2-4715-952A-089CC17513A9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{59B97B63-1800-4511-A93A-3BB575D9ECC8}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CD3E533D-3658-46D9-90EE-4E8344A076FD}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2CFFD4E7-903A-4C6A-A580-5AE2285A7A26}"
@@ -25,6 +35,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EB3E1752-35A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{7CAFBF55-2D7E-45C5-BEFD-47377A70237D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{A3C776A3-AC6B-4205-8B1F-4D8F244C5D4A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{5615DAA5-7820-46C8-A2BF-2142908D06F4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{F248C245-CDDD-4467-9113-ECF33D521097}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{378E0975-327E-42AA-8154-D13FA0609413}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,6 +85,26 @@ Global
 		{F4BB7D19-A456-41DE-9A65-7876A2EF00D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F4BB7D19-A456-41DE-9A65-7876A2EF00D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F4BB7D19-A456-41DE-9A65-7876A2EF00D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{681196A9-9EEC-42BC-AC89-612B56FEFDC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{681196A9-9EEC-42BC-AC89-612B56FEFDC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{681196A9-9EEC-42BC-AC89-612B56FEFDC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{681196A9-9EEC-42BC-AC89-612B56FEFDC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63A59D01-FA16-4F20-B4CB-97B2B78F4307}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63A59D01-FA16-4F20-B4CB-97B2B78F4307}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63A59D01-FA16-4F20-B4CB-97B2B78F4307}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63A59D01-FA16-4F20-B4CB-97B2B78F4307}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB256F88-F5A2-4576-B279-D52A89E29644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB256F88-F5A2-4576-B279-D52A89E29644}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB256F88-F5A2-4576-B279-D52A89E29644}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB256F88-F5A2-4576-B279-D52A89E29644}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3070F484-7EA2-4715-952A-089CC17513A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3070F484-7EA2-4715-952A-089CC17513A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3070F484-7EA2-4715-952A-089CC17513A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3070F484-7EA2-4715-952A-089CC17513A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59B97B63-1800-4511-A93A-3BB575D9ECC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59B97B63-1800-4511-A93A-3BB575D9ECC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59B97B63-1800-4511-A93A-3BB575D9ECC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59B97B63-1800-4511-A93A-3BB575D9ECC8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -81,6 +119,14 @@ Global
 		{1312B533-04ED-4268-8DAF-A7C69BC870A4} = {EB3E1752-35A9-438C-8C14-0B56F9461589}
 		{EA27BB4A-F841-4806-85F7-3ABF92F9E8CE} = {7CAFBF55-2D7E-45C5-BEFD-47377A70237D}
 		{06C7EEAC-167E-42C7-B678-621F7B6BE395} = {7CAFBF55-2D7E-45C5-BEFD-47377A70237D}
+		{681196A9-9EEC-42BC-AC89-612B56FEFDC0} = {A3C776A3-AC6B-4205-8B1F-4D8F244C5D4A}
+		{63A59D01-FA16-4F20-B4CB-97B2B78F4307} = {A3C776A3-AC6B-4205-8B1F-4D8F244C5D4A}
+		{A3C776A3-AC6B-4205-8B1F-4D8F244C5D4A} = {378E0975-327E-42AA-8154-D13FA0609413}
+		{DB256F88-F5A2-4576-B279-D52A89E29644} = {5615DAA5-7820-46C8-A2BF-2142908D06F4}
+		{3070F484-7EA2-4715-952A-089CC17513A9} = {5615DAA5-7820-46C8-A2BF-2142908D06F4}
+		{5615DAA5-7820-46C8-A2BF-2142908D06F4} = {378E0975-327E-42AA-8154-D13FA0609413}
+		{59B97B63-1800-4511-A93A-3BB575D9ECC8} = {F248C245-CDDD-4467-9113-ECF33D521097}
+		{F248C245-CDDD-4467-9113-ECF33D521097} = {378E0975-327E-42AA-8154-D13FA0609413}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AF9218A4-1E73-408C-BEF5-0300BD9DDEB0}
diff --git a/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln b/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln
index 78660940df8b4..08fbf921798b4 100644
--- a/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln
+++ b/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln
@@ -19,6 +19,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{4B17E9F9-77EB-4FC4-A3A2-7901FFC4663D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{CC4666B6-A079-48EE-8078-BA9244F3EA08}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{6C6B3DE0-1C4F-4D47-B2AD-55E229E88C2B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{4ACEFC81-787F-47FF-A8B9-923A3D7B0344}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{CD03AD95-5D8B-4392-A9EC-7D6012019C71}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{98A5F113-D095-4CC1-AE13-47547F364E4A}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{75DB4DC3-5DD6-425B-BD36-19BF5B5E1180}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{20F9AEA0-7D11-4282-81E0-274CDF39D2DA}"
@@ -27,6 +37,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4E48C076-587
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B2591C6D-F523-4C15-9E29-2E2E01ACB2C4}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{B1497F09-0CB7-4FCA-BAE4-0D12C4C686B6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{F2040C70-B540-4D13-B2D1-960EE0D54B5B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{BCD8184D-00C0-4CE6-A1AE-E6AA0F91FD5E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{54CAE96E-C603-4619-9407-359A34AE49C0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -73,6 +91,26 @@ Global
 		{4B17E9F9-77EB-4FC4-A3A2-7901FFC4663D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4B17E9F9-77EB-4FC4-A3A2-7901FFC4663D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B17E9F9-77EB-4FC4-A3A2-7901FFC4663D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC4666B6-A079-48EE-8078-BA9244F3EA08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC4666B6-A079-48EE-8078-BA9244F3EA08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC4666B6-A079-48EE-8078-BA9244F3EA08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC4666B6-A079-48EE-8078-BA9244F3EA08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C6B3DE0-1C4F-4D47-B2AD-55E229E88C2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C6B3DE0-1C4F-4D47-B2AD-55E229E88C2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C6B3DE0-1C4F-4D47-B2AD-55E229E88C2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C6B3DE0-1C4F-4D47-B2AD-55E229E88C2B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4ACEFC81-787F-47FF-A8B9-923A3D7B0344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ACEFC81-787F-47FF-A8B9-923A3D7B0344}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4ACEFC81-787F-47FF-A8B9-923A3D7B0344}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4ACEFC81-787F-47FF-A8B9-923A3D7B0344}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD03AD95-5D8B-4392-A9EC-7D6012019C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD03AD95-5D8B-4392-A9EC-7D6012019C71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD03AD95-5D8B-4392-A9EC-7D6012019C71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD03AD95-5D8B-4392-A9EC-7D6012019C71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98A5F113-D095-4CC1-AE13-47547F364E4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98A5F113-D095-4CC1-AE13-47547F364E4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98A5F113-D095-4CC1-AE13-47547F364E4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98A5F113-D095-4CC1-AE13-47547F364E4A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -88,6 +126,14 @@ Global
 		{CDF79D0D-248D-48A5-A698-00D34FBA64E1} = {4E48C076-587B-43F6-81C7-3362BDC8D1D8}
 		{775CCE4D-79E3-4D13-8C57-1FEDA8F7B773} = {B2591C6D-F523-4C15-9E29-2E2E01ACB2C4}
 		{CE258E72-5765-46B4-8B93-59D11F91FAE1} = {B2591C6D-F523-4C15-9E29-2E2E01ACB2C4}
+		{CC4666B6-A079-48EE-8078-BA9244F3EA08} = {B1497F09-0CB7-4FCA-BAE4-0D12C4C686B6}
+		{6C6B3DE0-1C4F-4D47-B2AD-55E229E88C2B} = {B1497F09-0CB7-4FCA-BAE4-0D12C4C686B6}
+		{B1497F09-0CB7-4FCA-BAE4-0D12C4C686B6} = {54CAE96E-C603-4619-9407-359A34AE49C0}
+		{4ACEFC81-787F-47FF-A8B9-923A3D7B0344} = {F2040C70-B540-4D13-B2D1-960EE0D54B5B}
+		{CD03AD95-5D8B-4392-A9EC-7D6012019C71} = {F2040C70-B540-4D13-B2D1-960EE0D54B5B}
+		{F2040C70-B540-4D13-B2D1-960EE0D54B5B} = {54CAE96E-C603-4619-9407-359A34AE49C0}
+		{98A5F113-D095-4CC1-AE13-47547F364E4A} = {BCD8184D-00C0-4CE6-A1AE-E6AA0F91FD5E}
+		{BCD8184D-00C0-4CE6-A1AE-E6AA0F91FD5E} = {54CAE96E-C603-4619-9407-359A34AE49C0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {872BA41A-3769-426E-AB70-515BC1724FC0}
diff --git a/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln b/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln
index cd9d51c840a30..7c9594815cd65 100644
--- a/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln
+++ b/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln
@@ -21,6 +21,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{12AF1EDA-A597-4DEE-A91F-6E784B8D7555}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{0FBF7E3D-C30D-414A-AA92-B28A7AF0AAC9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{FA61FF7E-9F19-4B5C-A78B-39491154D2A9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{66202A8B-FEE0-4B98-8445-F6EB38B58847}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{999097B8-299F-4BE7-BA1F-EC352793B0C3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{4099A29A-377A-4A8C-B206-02D9F5BD6365}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{55EA11AE-0CFF-47C3-AF61-FE49C04F5C94}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4175E0A1-D5C1-470E-8F0A-EB05DED9B1F4}"
@@ -29,6 +39,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E6F704C7-241
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D124A349-76C6-4FD9-AE3F-D0B674D03CB3}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{14F93B64-3755-4118-B88A-D2D1E49F4692}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{781B2EF1-797B-44C6-9035-5B37FA96F2EF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{6167654B-0C9E-4473-ACC4-DE04D3BE85AA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{3873A7FE-08BE-4457-92E8-7D1D52FC9C73}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,6 +97,26 @@ Global
 		{12AF1EDA-A597-4DEE-A91F-6E784B8D7555}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{12AF1EDA-A597-4DEE-A91F-6E784B8D7555}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12AF1EDA-A597-4DEE-A91F-6E784B8D7555}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0FBF7E3D-C30D-414A-AA92-B28A7AF0AAC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FBF7E3D-C30D-414A-AA92-B28A7AF0AAC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FBF7E3D-C30D-414A-AA92-B28A7AF0AAC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0FBF7E3D-C30D-414A-AA92-B28A7AF0AAC9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA61FF7E-9F19-4B5C-A78B-39491154D2A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA61FF7E-9F19-4B5C-A78B-39491154D2A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA61FF7E-9F19-4B5C-A78B-39491154D2A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA61FF7E-9F19-4B5C-A78B-39491154D2A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66202A8B-FEE0-4B98-8445-F6EB38B58847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66202A8B-FEE0-4B98-8445-F6EB38B58847}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66202A8B-FEE0-4B98-8445-F6EB38B58847}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66202A8B-FEE0-4B98-8445-F6EB38B58847}.Release|Any CPU.Build.0 = Release|Any CPU
+		{999097B8-299F-4BE7-BA1F-EC352793B0C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{999097B8-299F-4BE7-BA1F-EC352793B0C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{999097B8-299F-4BE7-BA1F-EC352793B0C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{999097B8-299F-4BE7-BA1F-EC352793B0C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4099A29A-377A-4A8C-B206-02D9F5BD6365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4099A29A-377A-4A8C-B206-02D9F5BD6365}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4099A29A-377A-4A8C-B206-02D9F5BD6365}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4099A29A-377A-4A8C-B206-02D9F5BD6365}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -95,6 +133,14 @@ Global
 		{EC9BDC43-2701-4942-AFAC-FED0555B60C9} = {E6F704C7-2418-4ADC-90E6-9C6570EF57BB}
 		{D100FF6C-66B4-43A9-AB3E-80E8B3D87A7F} = {D124A349-76C6-4FD9-AE3F-D0B674D03CB3}
 		{ACFE06FC-0223-4F8F-88B9-AE977B9BEB30} = {D124A349-76C6-4FD9-AE3F-D0B674D03CB3}
+		{0FBF7E3D-C30D-414A-AA92-B28A7AF0AAC9} = {14F93B64-3755-4118-B88A-D2D1E49F4692}
+		{FA61FF7E-9F19-4B5C-A78B-39491154D2A9} = {14F93B64-3755-4118-B88A-D2D1E49F4692}
+		{14F93B64-3755-4118-B88A-D2D1E49F4692} = {3873A7FE-08BE-4457-92E8-7D1D52FC9C73}
+		{66202A8B-FEE0-4B98-8445-F6EB38B58847} = {781B2EF1-797B-44C6-9035-5B37FA96F2EF}
+		{999097B8-299F-4BE7-BA1F-EC352793B0C3} = {781B2EF1-797B-44C6-9035-5B37FA96F2EF}
+		{781B2EF1-797B-44C6-9035-5B37FA96F2EF} = {3873A7FE-08BE-4457-92E8-7D1D52FC9C73}
+		{4099A29A-377A-4A8C-B206-02D9F5BD6365} = {6167654B-0C9E-4473-ACC4-DE04D3BE85AA}
+		{6167654B-0C9E-4473-ACC4-DE04D3BE85AA} = {3873A7FE-08BE-4457-92E8-7D1D52FC9C73}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EF81B838-4913-4654-BE99-E88F7656DE81}
diff --git a/src/libraries/System.Linq/System.Linq.sln b/src/libraries/System.Linq/System.Linq.sln
index fcfd56644a8d8..b6b2290abd290 100644
--- a/src/libraries/System.Linq/System.Linq.sln
+++ b/src/libraries/System.Linq/System.Linq.sln
@@ -17,6 +17,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{D3160C37-FC48-4907-8F4A-F584ED12B275}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{E0CA3ED5-EE6C-4F7C-BCE7-EFB1D64A9CD1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{3EFB74E7-616A-48C1-B43B-3F89AA5013E6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{28ABC524-ACEE-4183-A64A-49E3DC830595}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{721DB3D9-8221-424E-BE29-084CDD20D26E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{E19B8772-2DBD-4274-8190-F3CC0242A1C0}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E291F4BF-7B8B-45AD-88F5-FB8B8380C126}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0BCB262A-FC13-4A48-BB0B-9FA293594701}"
@@ -25,6 +35,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E6102BFA-080
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E61195C4-72B4-47A3-AC98-1F896A0C770F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{84E98F7C-FA2B-4048-AB7C-9FCDEA9CD37E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{8CA90AB2-58B9-45E7-A684-EDB60C6924B0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{7C5B49B9-F7D9-41FB-A8FA-94328BDDCCD1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0ADC596A-5B2E-4E5F-B5B5-DEB65A6C7E9D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,6 +85,26 @@ Global
 		{D3160C37-FC48-4907-8F4A-F584ED12B275}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D3160C37-FC48-4907-8F4A-F584ED12B275}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D3160C37-FC48-4907-8F4A-F584ED12B275}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E0CA3ED5-EE6C-4F7C-BCE7-EFB1D64A9CD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0CA3ED5-EE6C-4F7C-BCE7-EFB1D64A9CD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0CA3ED5-EE6C-4F7C-BCE7-EFB1D64A9CD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0CA3ED5-EE6C-4F7C-BCE7-EFB1D64A9CD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3EFB74E7-616A-48C1-B43B-3F89AA5013E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EFB74E7-616A-48C1-B43B-3F89AA5013E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3EFB74E7-616A-48C1-B43B-3F89AA5013E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3EFB74E7-616A-48C1-B43B-3F89AA5013E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28ABC524-ACEE-4183-A64A-49E3DC830595}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28ABC524-ACEE-4183-A64A-49E3DC830595}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28ABC524-ACEE-4183-A64A-49E3DC830595}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28ABC524-ACEE-4183-A64A-49E3DC830595}.Release|Any CPU.Build.0 = Release|Any CPU
+		{721DB3D9-8221-424E-BE29-084CDD20D26E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{721DB3D9-8221-424E-BE29-084CDD20D26E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{721DB3D9-8221-424E-BE29-084CDD20D26E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{721DB3D9-8221-424E-BE29-084CDD20D26E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E19B8772-2DBD-4274-8190-F3CC0242A1C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E19B8772-2DBD-4274-8190-F3CC0242A1C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E19B8772-2DBD-4274-8190-F3CC0242A1C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E19B8772-2DBD-4274-8190-F3CC0242A1C0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -81,6 +119,14 @@ Global
 		{9A13A12F-C924-43AF-94AF-6F1B33582D27} = {E61195C4-72B4-47A3-AC98-1F896A0C770F}
 		{4BEC631E-B5FD-453F-82A0-C95C461798EA} = {E61195C4-72B4-47A3-AC98-1F896A0C770F}
 		{C8F0459C-15D5-4624-8CE4-E93ADF96A28C} = {E61195C4-72B4-47A3-AC98-1F896A0C770F}
+		{E0CA3ED5-EE6C-4F7C-BCE7-EFB1D64A9CD1} = {84E98F7C-FA2B-4048-AB7C-9FCDEA9CD37E}
+		{3EFB74E7-616A-48C1-B43B-3F89AA5013E6} = {84E98F7C-FA2B-4048-AB7C-9FCDEA9CD37E}
+		{84E98F7C-FA2B-4048-AB7C-9FCDEA9CD37E} = {0ADC596A-5B2E-4E5F-B5B5-DEB65A6C7E9D}
+		{28ABC524-ACEE-4183-A64A-49E3DC830595} = {8CA90AB2-58B9-45E7-A684-EDB60C6924B0}
+		{721DB3D9-8221-424E-BE29-084CDD20D26E} = {8CA90AB2-58B9-45E7-A684-EDB60C6924B0}
+		{8CA90AB2-58B9-45E7-A684-EDB60C6924B0} = {0ADC596A-5B2E-4E5F-B5B5-DEB65A6C7E9D}
+		{E19B8772-2DBD-4274-8190-F3CC0242A1C0} = {7C5B49B9-F7D9-41FB-A8FA-94328BDDCCD1}
+		{7C5B49B9-F7D9-41FB-A8FA-94328BDDCCD1} = {0ADC596A-5B2E-4E5F-B5B5-DEB65A6C7E9D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A4970D79-BF1C-4343-9070-B409DBB69F93}
diff --git a/src/libraries/System.Management/System.Management.sln b/src/libraries/System.Management/System.Management.sln
index b83958c8ffb86..781dabe5c1062 100644
--- a/src/libraries/System.Management/System.Management.sln
+++ b/src/libraries/System.Management/System.Management.sln
@@ -11,12 +11,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Management", "src\Sy
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{EB44DCC8-9DFE-498B-8A4B-ED945FEAD6FB}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{8A7BDD6F-B220-4FDD-BC2A-A909A7C01D61}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{AEECC1B0-80B3-4DD2-A309-76E4CF12310E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{AEFFA5B2-1429-4523-91F4-21ACB4B2506B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{BDFF48AD-B58E-4448-AA89-9DC66D31E4E7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{868994E7-C8E2-4955-A401-B948D8D692DD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{57ABF831-FDB1-4E37-86A1-0B14AFF7C2A5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{D9B4BD07-C6E5-4706-83F5-D03856D8EC27}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{50F325CE-EDFC-4704-BF30-C97AACD9F558}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{441745A2-6E7F-48B9-8C9D-A48E0171B3A5}"
@@ -25,6 +33,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6DC74D98-13B
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{64360DAC-C8F2-4231-A678-CCEFD683949D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{FE18DE22-5111-48B6-BC70-AC9F1F1D8F33}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D84C8FA3-A0E1-42B2-B4FB-7074F0DECC3E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{7FC11456-3BC2-4272-9128-E0CEAE171C08}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{F5A22B82-8BAD-4668-BEB8-ED2334737921}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,10 +71,6 @@ Global
 		{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
-		{EB44DCC8-9DFE-498B-8A4B-ED945FEAD6FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB44DCC8-9DFE-498B-8A4B-ED945FEAD6FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB44DCC8-9DFE-498B-8A4B-ED945FEAD6FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB44DCC8-9DFE-498B-8A4B-ED945FEAD6FB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8A7BDD6F-B220-4FDD-BC2A-A909A7C01D61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8A7BDD6F-B220-4FDD-BC2A-A909A7C01D61}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8A7BDD6F-B220-4FDD-BC2A-A909A7C01D61}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -67,6 +79,26 @@ Global
 		{AEECC1B0-80B3-4DD2-A309-76E4CF12310E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AEECC1B0-80B3-4DD2-A309-76E4CF12310E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AEECC1B0-80B3-4DD2-A309-76E4CF12310E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AEFFA5B2-1429-4523-91F4-21ACB4B2506B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEFFA5B2-1429-4523-91F4-21ACB4B2506B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AEFFA5B2-1429-4523-91F4-21ACB4B2506B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AEFFA5B2-1429-4523-91F4-21ACB4B2506B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDFF48AD-B58E-4448-AA89-9DC66D31E4E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDFF48AD-B58E-4448-AA89-9DC66D31E4E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDFF48AD-B58E-4448-AA89-9DC66D31E4E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDFF48AD-B58E-4448-AA89-9DC66D31E4E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{868994E7-C8E2-4955-A401-B948D8D692DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{868994E7-C8E2-4955-A401-B948D8D692DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{868994E7-C8E2-4955-A401-B948D8D692DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{868994E7-C8E2-4955-A401-B948D8D692DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57ABF831-FDB1-4E37-86A1-0B14AFF7C2A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57ABF831-FDB1-4E37-86A1-0B14AFF7C2A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57ABF831-FDB1-4E37-86A1-0B14AFF7C2A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57ABF831-FDB1-4E37-86A1-0B14AFF7C2A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9B4BD07-C6E5-4706-83F5-D03856D8EC27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9B4BD07-C6E5-4706-83F5-D03856D8EC27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9B4BD07-C6E5-4706-83F5-D03856D8EC27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9B4BD07-C6E5-4706-83F5-D03856D8EC27}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -78,9 +110,16 @@ Global
 		{12233594-0AC7-45C7-B4E7-8DAF161A299E} = {441745A2-6E7F-48B9-8C9D-A48E0171B3A5}
 		{7B9EB977-908A-43CB-B2FB-E4E34373F3BF} = {6DC74D98-13B5-4230-87B4-ED3162AFC233}
 		{D31C6457-B81D-4503-938B-93877DDDBDB5} = {6DC74D98-13B5-4230-87B4-ED3162AFC233}
-		{EB44DCC8-9DFE-498B-8A4B-ED945FEAD6FB} = {64360DAC-C8F2-4231-A678-CCEFD683949D}
 		{8A7BDD6F-B220-4FDD-BC2A-A909A7C01D61} = {64360DAC-C8F2-4231-A678-CCEFD683949D}
 		{AEECC1B0-80B3-4DD2-A309-76E4CF12310E} = {64360DAC-C8F2-4231-A678-CCEFD683949D}
+		{AEFFA5B2-1429-4523-91F4-21ACB4B2506B} = {FE18DE22-5111-48B6-BC70-AC9F1F1D8F33}
+		{BDFF48AD-B58E-4448-AA89-9DC66D31E4E7} = {FE18DE22-5111-48B6-BC70-AC9F1F1D8F33}
+		{FE18DE22-5111-48B6-BC70-AC9F1F1D8F33} = {F5A22B82-8BAD-4668-BEB8-ED2334737921}
+		{868994E7-C8E2-4955-A401-B948D8D692DD} = {D84C8FA3-A0E1-42B2-B4FB-7074F0DECC3E}
+		{57ABF831-FDB1-4E37-86A1-0B14AFF7C2A5} = {D84C8FA3-A0E1-42B2-B4FB-7074F0DECC3E}
+		{D84C8FA3-A0E1-42B2-B4FB-7074F0DECC3E} = {F5A22B82-8BAD-4668-BEB8-ED2334737921}
+		{D9B4BD07-C6E5-4706-83F5-D03856D8EC27} = {7FC11456-3BC2-4272-9128-E0CEAE171C08}
+		{7FC11456-3BC2-4272-9128-E0CEAE171C08} = {F5A22B82-8BAD-4668-BEB8-ED2334737921}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9D09EF76-3A6B-4481-95BC-9E56C3DCD30A}
diff --git a/src/libraries/System.Memory.Data/System.Memory.Data.sln b/src/libraries/System.Memory.Data/System.Memory.Data.sln
index c9de519426fbb..5edcbf67ac010 100644
--- a/src/libraries/System.Memory.Data/System.Memory.Data.sln
+++ b/src/libraries/System.Memory.Data/System.Memory.Data.sln
@@ -39,6 +39,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{6A2B5C68-14C3-4989-8530-D51A138C72AE}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{34DD0132-4503-4F9F-85AA-DEBC1B6ACEC6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{997C37FF-FD71-4A5F-827C-09EB6568DAC9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{C0FB3BB4-0A83-406B-AD72-6D172B4E349D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{1D206501-B05A-435E-9030-AC97151D9BF0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{659C7947-E20D-4BC7-890B-D3ACFFB968CF}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2BD73108-47D7-40E6-BFCB-169E6AD42A81}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E6AF8CEE-6550-4190-97D4-D51C5B114919}"
@@ -47,6 +57,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D908DCBE-EFA
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{839FCC67-5EA8-4A07-B5D4-9E1DF0B3BE76}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{9A2475E4-53E1-4CF3-800C-8A52E56E9AA8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{08ED893A-F59D-436B-AD90-5C8CEC95D68D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{EE781130-E85F-42C0-84D2-922CE46604CD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{19625575-916C-4A48-B7AA-FBFC51B68C05}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -133,6 +151,26 @@ Global
 		{6A2B5C68-14C3-4989-8530-D51A138C72AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A2B5C68-14C3-4989-8530-D51A138C72AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A2B5C68-14C3-4989-8530-D51A138C72AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34DD0132-4503-4F9F-85AA-DEBC1B6ACEC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34DD0132-4503-4F9F-85AA-DEBC1B6ACEC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34DD0132-4503-4F9F-85AA-DEBC1B6ACEC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34DD0132-4503-4F9F-85AA-DEBC1B6ACEC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{997C37FF-FD71-4A5F-827C-09EB6568DAC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{997C37FF-FD71-4A5F-827C-09EB6568DAC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{997C37FF-FD71-4A5F-827C-09EB6568DAC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{997C37FF-FD71-4A5F-827C-09EB6568DAC9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0FB3BB4-0A83-406B-AD72-6D172B4E349D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0FB3BB4-0A83-406B-AD72-6D172B4E349D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0FB3BB4-0A83-406B-AD72-6D172B4E349D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0FB3BB4-0A83-406B-AD72-6D172B4E349D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D206501-B05A-435E-9030-AC97151D9BF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D206501-B05A-435E-9030-AC97151D9BF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D206501-B05A-435E-9030-AC97151D9BF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D206501-B05A-435E-9030-AC97151D9BF0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{659C7947-E20D-4BC7-890B-D3ACFFB968CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{659C7947-E20D-4BC7-890B-D3ACFFB968CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{659C7947-E20D-4BC7-890B-D3ACFFB968CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{659C7947-E20D-4BC7-890B-D3ACFFB968CF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -158,6 +196,14 @@ Global
 		{898AC186-6BE8-4266-954D-DFFF3EE6C428} = {839FCC67-5EA8-4A07-B5D4-9E1DF0B3BE76}
 		{C7F95DF5-1832-4AEA-943B-86ED0226D98B} = {839FCC67-5EA8-4A07-B5D4-9E1DF0B3BE76}
 		{87AD8C70-4F96-4BD5-A265-2C74AD699B8D} = {839FCC67-5EA8-4A07-B5D4-9E1DF0B3BE76}
+		{34DD0132-4503-4F9F-85AA-DEBC1B6ACEC6} = {9A2475E4-53E1-4CF3-800C-8A52E56E9AA8}
+		{997C37FF-FD71-4A5F-827C-09EB6568DAC9} = {9A2475E4-53E1-4CF3-800C-8A52E56E9AA8}
+		{9A2475E4-53E1-4CF3-800C-8A52E56E9AA8} = {19625575-916C-4A48-B7AA-FBFC51B68C05}
+		{C0FB3BB4-0A83-406B-AD72-6D172B4E349D} = {08ED893A-F59D-436B-AD90-5C8CEC95D68D}
+		{1D206501-B05A-435E-9030-AC97151D9BF0} = {08ED893A-F59D-436B-AD90-5C8CEC95D68D}
+		{08ED893A-F59D-436B-AD90-5C8CEC95D68D} = {19625575-916C-4A48-B7AA-FBFC51B68C05}
+		{659C7947-E20D-4BC7-890B-D3ACFFB968CF} = {EE781130-E85F-42C0-84D2-922CE46604CD}
+		{EE781130-E85F-42C0-84D2-922CE46604CD} = {19625575-916C-4A48-B7AA-FBFC51B68C05}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {01DAF96B-AF8E-4576-A1BC-57D19BDB317E}
diff --git a/src/libraries/System.Memory/System.Memory.sln b/src/libraries/System.Memory/System.Memory.sln
index 3d8eeb58479d5..0a42d856783e9 100644
--- a/src/libraries/System.Memory/System.Memory.sln
+++ b/src/libraries/System.Memory/System.Memory.sln
@@ -19,14 +19,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{B773D664-C00B-4DB3-823B-947576EE7A46}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C352AC7D-959D-431F-AF83-2CA506B70D59}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{9EB7CD91-D219-46C8-BBC2-946F783464FD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{9487A961-D429-4BBF-9205-C00003F067EE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{800A865E-19E1-4BC1-936A-FFC10C11F723}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{E09A57A2-B2DC-492A-915B-DD6EF4FD1F8A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FA259C32-B79B-4DE2-9677-055D5D25FA33}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7212FBCF-E89D-4065-9DCE-D5F7E5D3EF1D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C352AC7D-959D-431F-AF83-2CA506B70D59}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2BEB1A89-DD2D-42BD-95DD-89860A0C9663}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{24985D32-AECC-4F31-A921-294FA81577F1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{46EA57E0-CA55-47BE-B9E3-4943095E6DC7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{D6E3917E-D969-4010-9BC3-49DCD551CFC4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{68DAD68A-562B-43A2-809F-22779FBD4BFF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -265,21 +285,134 @@ Global
 		{B773D664-C00B-4DB3-823B-947576EE7A46}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{B773D664-C00B-4DB3-823B-947576EE7A46}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{B773D664-C00B-4DB3-823B-947576EE7A46}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Debug|x64.Build.0 = Debug|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Debug|x86.Build.0 = Debug|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Release|arm.ActiveCfg = Release|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Release|x64.ActiveCfg = Release|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Release|x64.Build.0 = Release|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Release|x86.ActiveCfg = Release|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Release|x86.Build.0 = Release|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Debug|x64.Build.0 = Debug|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Debug|x86.Build.0 = Debug|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Release|arm.ActiveCfg = Release|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Release|x64.ActiveCfg = Release|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Release|x64.Build.0 = Release|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Release|x86.ActiveCfg = Release|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Release|x86.Build.0 = Release|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Debug|x64.Build.0 = Debug|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Debug|x86.Build.0 = Debug|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Release|arm.ActiveCfg = Release|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Release|x64.ActiveCfg = Release|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Release|x64.Build.0 = Release|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Release|x86.ActiveCfg = Release|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Release|x86.Build.0 = Release|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9487A961-D429-4BBF-9205-C00003F067EE}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Debug|x64.Build.0 = Debug|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Debug|x86.Build.0 = Debug|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Release|Any CPU.Build.0 = Release|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Release|arm.ActiveCfg = Release|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Release|arm64.ActiveCfg = Release|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Release|x64.ActiveCfg = Release|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Release|x64.Build.0 = Release|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Release|x86.ActiveCfg = Release|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Release|x86.Build.0 = Release|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{800A865E-19E1-4BC1-936A-FFC10C11F723}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Debug|x64.Build.0 = Debug|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Debug|x86.Build.0 = Debug|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Release|arm.ActiveCfg = Release|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Release|x64.ActiveCfg = Release|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Release|x64.Build.0 = Release|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Release|x86.ActiveCfg = Release|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Release|x86.Build.0 = Release|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22} = {C352AC7D-959D-431F-AF83-2CA506B70D59}
-		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92} = {C352AC7D-959D-431F-AF83-2CA506B70D59}
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22} = {E09A57A2-B2DC-492A-915B-DD6EF4FD1F8A}
 		{6A54FACA-933E-4C1D-92AB-1A5506CFC212} = {FA259C32-B79B-4DE2-9677-055D5D25FA33}
 		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297} = {FA259C32-B79B-4DE2-9677-055D5D25FA33}
 		{9112BAE3-344D-4DD0-ADC9-478D82B84584} = {7212FBCF-E89D-4065-9DCE-D5F7E5D3EF1D}
 		{D0EEF7E0-BD51-4C39-AF4F-DD583D01AEBE} = {7212FBCF-E89D-4065-9DCE-D5F7E5D3EF1D}
 		{B773D664-C00B-4DB3-823B-947576EE7A46} = {7212FBCF-E89D-4065-9DCE-D5F7E5D3EF1D}
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92} = {C352AC7D-959D-431F-AF83-2CA506B70D59}
 		{EFF00253-633C-4D2F-86EE-F40C721F6A68} = {2BEB1A89-DD2D-42BD-95DD-89860A0C9663}
 		{84AD7BF6-D76C-4BEE-9879-5A23150DD3F7} = {2BEB1A89-DD2D-42BD-95DD-89860A0C9663}
 		{DA7CEED7-1A86-4221-B4AD-4307AB83A31F} = {2BEB1A89-DD2D-42BD-95DD-89860A0C9663}
+		{9EB7CD91-D219-46C8-BBC2-946F783464FD} = {24985D32-AECC-4F31-A921-294FA81577F1}
+		{F0E5B145-2F0F-4F11-A261-616F3DF8D3B1} = {24985D32-AECC-4F31-A921-294FA81577F1}
+		{24985D32-AECC-4F31-A921-294FA81577F1} = {68DAD68A-562B-43A2-809F-22779FBD4BFF}
+		{9487A961-D429-4BBF-9205-C00003F067EE} = {46EA57E0-CA55-47BE-B9E3-4943095E6DC7}
+		{800A865E-19E1-4BC1-936A-FFC10C11F723} = {46EA57E0-CA55-47BE-B9E3-4943095E6DC7}
+		{46EA57E0-CA55-47BE-B9E3-4943095E6DC7} = {68DAD68A-562B-43A2-809F-22779FBD4BFF}
+		{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF} = {D6E3917E-D969-4010-9BC3-49DCD551CFC4}
+		{D6E3917E-D969-4010-9BC3-49DCD551CFC4} = {68DAD68A-562B-43A2-809F-22779FBD4BFF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {65DB6A6B-0AAC-4BC2-A61A-641679771DC7}
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 719fd98b53b6a..46003d8a3fb18 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
@@ -63,6 +63,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{371E49E2-E922-4E89-AC56-30E18389BDB0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{12E7159F-D305-47A7-9943-0BF3F7950C87}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{DEFA64C6-C61E-4D60-9212-11EF368E80B7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{33FA9EA4-D65A-4C8C-909C-2E290621C172}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{CF44C8B9-7B38-4F80-B95C-99EB1E112A0F}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A75027EA-199E-4C86-A636-AE9AE0F0756C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{945B0700-C720-4775-B9E4-6A27DAA90190}"
@@ -71,6 +81,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2A66925D-365
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5A418E02-B18A-41F1-9D4F-1BD6CB51F63C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0C6EA345-353C-4E9E-8983-7EA339ED3F62}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{76767690-169A-4B54-8FBD-D8FE1BA5CF1E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{50BB5C13-2E19-48FB-A9A5-670FCA495799}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{6B3CFFF1-46CC-47E3-9AB4-670B57969042}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -205,6 +223,26 @@ Global
 		{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
+		{371E49E2-E922-4E89-AC56-30E18389BDB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{371E49E2-E922-4E89-AC56-30E18389BDB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{371E49E2-E922-4E89-AC56-30E18389BDB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{371E49E2-E922-4E89-AC56-30E18389BDB0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12E7159F-D305-47A7-9943-0BF3F7950C87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12E7159F-D305-47A7-9943-0BF3F7950C87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12E7159F-D305-47A7-9943-0BF3F7950C87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12E7159F-D305-47A7-9943-0BF3F7950C87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DEFA64C6-C61E-4D60-9212-11EF368E80B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEFA64C6-C61E-4D60-9212-11EF368E80B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEFA64C6-C61E-4D60-9212-11EF368E80B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEFA64C6-C61E-4D60-9212-11EF368E80B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33FA9EA4-D65A-4C8C-909C-2E290621C172}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33FA9EA4-D65A-4C8C-909C-2E290621C172}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33FA9EA4-D65A-4C8C-909C-2E290621C172}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33FA9EA4-D65A-4C8C-909C-2E290621C172}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF44C8B9-7B38-4F80-B95C-99EB1E112A0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF44C8B9-7B38-4F80-B95C-99EB1E112A0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF44C8B9-7B38-4F80-B95C-99EB1E112A0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF44C8B9-7B38-4F80-B95C-99EB1E112A0F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -242,6 +280,14 @@ Global
 		{E277B012-C6EE-4032-9E80-C1EE3BAD7F51} = {5A418E02-B18A-41F1-9D4F-1BD6CB51F63C}
 		{65F336C0-BFB7-4248-A56C-8F1AE8770590} = {5A418E02-B18A-41F1-9D4F-1BD6CB51F63C}
 		{01A80754-3531-4394-98C6-0739793B66FA} = {5A418E02-B18A-41F1-9D4F-1BD6CB51F63C}
+		{371E49E2-E922-4E89-AC56-30E18389BDB0} = {0C6EA345-353C-4E9E-8983-7EA339ED3F62}
+		{12E7159F-D305-47A7-9943-0BF3F7950C87} = {0C6EA345-353C-4E9E-8983-7EA339ED3F62}
+		{0C6EA345-353C-4E9E-8983-7EA339ED3F62} = {6B3CFFF1-46CC-47E3-9AB4-670B57969042}
+		{DEFA64C6-C61E-4D60-9212-11EF368E80B7} = {76767690-169A-4B54-8FBD-D8FE1BA5CF1E}
+		{33FA9EA4-D65A-4C8C-909C-2E290621C172} = {76767690-169A-4B54-8FBD-D8FE1BA5CF1E}
+		{76767690-169A-4B54-8FBD-D8FE1BA5CF1E} = {6B3CFFF1-46CC-47E3-9AB4-670B57969042}
+		{CF44C8B9-7B38-4F80-B95C-99EB1E112A0F} = {50BB5C13-2E19-48FB-A9A5-670FCA495799}
+		{50BB5C13-2E19-48FB-A9A5-670FCA495799} = {6B3CFFF1-46CC-47E3-9AB4-670B57969042}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A121E5BA-D935-4572-8D67-2F15DF29922B}
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln b/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
index 6a67e74c3c52c..c06a038d8688e 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
@@ -71,6 +71,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\Syst
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{32750AA0-0562-423B-9C11-8278517391EF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{A46F856D-817F-4D3E-90F6-0523CA249B99}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{84F9B0D2-F77F-4B39-A932-D94D22AE1434}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{FA756A2B-6F4B-47F2-9C18-9CB027D2B69B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{08F2746D-4DF3-408B-A85A-7F0CFC2FCAB6}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6C66589E-2DB3-4635-BADA-9B6452327239}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2F9A243D-B060-4BB2-A9E1-A9CB861328D9}"
@@ -79,6 +89,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{49E09973-383
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B8C52E24-376F-4E8D-AA8A-62E25C161863}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{AB5A3276-13E4-47A4-9793-A3C70FB9C27A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{FA5B8379-828E-4DDC-9431-62D5FC345C5C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{E9C99065-3C4D-46FF-9D5A-43259D5F99D6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{F6F2F488-D5FC-4AED-B1C4-6E0B7BF9C825}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -229,6 +247,26 @@ Global
 		{E470810A-BAF2-4B3C-92CB-72007B7F1B6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E470810A-BAF2-4B3C-92CB-72007B7F1B6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E470810A-BAF2-4B3C-92CB-72007B7F1B6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32750AA0-0562-423B-9C11-8278517391EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32750AA0-0562-423B-9C11-8278517391EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32750AA0-0562-423B-9C11-8278517391EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32750AA0-0562-423B-9C11-8278517391EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A46F856D-817F-4D3E-90F6-0523CA249B99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A46F856D-817F-4D3E-90F6-0523CA249B99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A46F856D-817F-4D3E-90F6-0523CA249B99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A46F856D-817F-4D3E-90F6-0523CA249B99}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84F9B0D2-F77F-4B39-A932-D94D22AE1434}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84F9B0D2-F77F-4B39-A932-D94D22AE1434}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84F9B0D2-F77F-4B39-A932-D94D22AE1434}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84F9B0D2-F77F-4B39-A932-D94D22AE1434}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA756A2B-6F4B-47F2-9C18-9CB027D2B69B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA756A2B-6F4B-47F2-9C18-9CB027D2B69B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA756A2B-6F4B-47F2-9C18-9CB027D2B69B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA756A2B-6F4B-47F2-9C18-9CB027D2B69B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08F2746D-4DF3-408B-A85A-7F0CFC2FCAB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08F2746D-4DF3-408B-A85A-7F0CFC2FCAB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08F2746D-4DF3-408B-A85A-7F0CFC2FCAB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08F2746D-4DF3-408B-A85A-7F0CFC2FCAB6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -270,6 +308,14 @@ Global
 		{F37B0EB9-2882-42F9-88DE-BB55AD9DCA5D} = {B8C52E24-376F-4E8D-AA8A-62E25C161863}
 		{310F6EE8-5F12-4663-A5B8-01344C5CC821} = {B8C52E24-376F-4E8D-AA8A-62E25C161863}
 		{F39DE885-64D8-4551-91C6-3E9DBD4D8C88} = {B8C52E24-376F-4E8D-AA8A-62E25C161863}
+		{32750AA0-0562-423B-9C11-8278517391EF} = {AB5A3276-13E4-47A4-9793-A3C70FB9C27A}
+		{A46F856D-817F-4D3E-90F6-0523CA249B99} = {AB5A3276-13E4-47A4-9793-A3C70FB9C27A}
+		{AB5A3276-13E4-47A4-9793-A3C70FB9C27A} = {F6F2F488-D5FC-4AED-B1C4-6E0B7BF9C825}
+		{84F9B0D2-F77F-4B39-A932-D94D22AE1434} = {FA5B8379-828E-4DDC-9431-62D5FC345C5C}
+		{FA756A2B-6F4B-47F2-9C18-9CB027D2B69B} = {FA5B8379-828E-4DDC-9431-62D5FC345C5C}
+		{FA5B8379-828E-4DDC-9431-62D5FC345C5C} = {F6F2F488-D5FC-4AED-B1C4-6E0B7BF9C825}
+		{08F2746D-4DF3-408B-A85A-7F0CFC2FCAB6} = {E9C99065-3C4D-46FF-9D5A-43259D5F99D6}
+		{E9C99065-3C4D-46FF-9D5A-43259D5F99D6} = {F6F2F488-D5FC-4AED-B1C4-6E0B7BF9C825}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F5BAF3DD-D05C-4DCC-BB36-16645CA1F151}
diff --git a/src/libraries/System.Net.Http/System.Net.Http.sln b/src/libraries/System.Net.Http/System.Net.Http.sln
index 4f5ae88a840cf..f92096dd362f4 100644
--- a/src/libraries/System.Net.Http/System.Net.Http.sln
+++ b/src/libraries/System.Net.Http/System.Net.Http.sln
@@ -37,6 +37,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Sockets", "..\Sy
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JSImportGenerator", "..\System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj", "{17069DE3-C00A-4A4C-9FAF-557F2E8A6197}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.JavaScript", "..\System.Runtime.InteropServices.JavaScript\ref\System.Runtime.InteropServices.JavaScript.csproj", "{AA7B5256-A933-4F5F-9E66-AFDADD386BAF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.JavaScript", "..\System.Runtime.InteropServices.JavaScript\src\System.Runtime.InteropServices.JavaScript.csproj", "{92D3020D-AB3C-44FC-BC22-ECFF8E83645D}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{FC847978-9218-451E-BD07-910E11D59AD1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{98AA859A-14F1-465D-80D6-343A4075CC7B}"
@@ -51,6 +55,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography", "..\System.Security.Cryptography\ref\System.Security.Cryptography.csproj", "{E33BB464-D65A-46DB-9BC1-836A5D126196}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{AA699427-03F4-4247-A537-0BFB872BD177}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{A9E863FB-3904-41CF-88D9-FEE8A0AE7D80}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{4A09D92F-DDA7-4FCF-9F8F-A5FBD4A5ADF8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{A9E8F328-3B36-4DE5-96AC-6625F2C12664}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{4D3B8DF2-580F-4DDC-B189-2CC2DA9CAA04}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0656F36C-F261-4F5A-B3E1-2DBB9FA6CF10}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}"
@@ -59,6 +73,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{145B4B2E-5EF
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{7841027C-6B57-4756-A757-8B19ECA0D9C7}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{6A8E1C6E-AED3-4791-8A4E-2F984E96C675}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{21C29D7F-0441-4D31-8D83-56689F95B22A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{1328089C-8717-4A25-9F71-65D7D0ECA031}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{7016A2BA-7735-4FFB-9FFF-BB6A14A2CF9E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -141,6 +163,14 @@ Global
 		{17069DE3-C00A-4A4C-9FAF-557F2E8A6197}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{17069DE3-C00A-4A4C-9FAF-557F2E8A6197}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17069DE3-C00A-4A4C-9FAF-557F2E8A6197}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA7B5256-A933-4F5F-9E66-AFDADD386BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA7B5256-A933-4F5F-9E66-AFDADD386BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA7B5256-A933-4F5F-9E66-AFDADD386BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA7B5256-A933-4F5F-9E66-AFDADD386BAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92D3020D-AB3C-44FC-BC22-ECFF8E83645D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92D3020D-AB3C-44FC-BC22-ECFF8E83645D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92D3020D-AB3C-44FC-BC22-ECFF8E83645D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92D3020D-AB3C-44FC-BC22-ECFF8E83645D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FC847978-9218-451E-BD07-910E11D59AD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FC847978-9218-451E-BD07-910E11D59AD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FC847978-9218-451E-BD07-910E11D59AD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -169,6 +199,26 @@ Global
 		{E33BB464-D65A-46DB-9BC1-836A5D126196}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E33BB464-D65A-46DB-9BC1-836A5D126196}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E33BB464-D65A-46DB-9BC1-836A5D126196}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA699427-03F4-4247-A537-0BFB872BD177}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA699427-03F4-4247-A537-0BFB872BD177}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA699427-03F4-4247-A537-0BFB872BD177}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA699427-03F4-4247-A537-0BFB872BD177}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9E863FB-3904-41CF-88D9-FEE8A0AE7D80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9E863FB-3904-41CF-88D9-FEE8A0AE7D80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9E863FB-3904-41CF-88D9-FEE8A0AE7D80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9E863FB-3904-41CF-88D9-FEE8A0AE7D80}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A09D92F-DDA7-4FCF-9F8F-A5FBD4A5ADF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A09D92F-DDA7-4FCF-9F8F-A5FBD4A5ADF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A09D92F-DDA7-4FCF-9F8F-A5FBD4A5ADF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A09D92F-DDA7-4FCF-9F8F-A5FBD4A5ADF8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9E8F328-3B36-4DE5-96AC-6625F2C12664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9E8F328-3B36-4DE5-96AC-6625F2C12664}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9E8F328-3B36-4DE5-96AC-6625F2C12664}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9E8F328-3B36-4DE5-96AC-6625F2C12664}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D3B8DF2-580F-4DDC-B189-2CC2DA9CAA04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D3B8DF2-580F-4DDC-B189-2CC2DA9CAA04}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D3B8DF2-580F-4DDC-B189-2CC2DA9CAA04}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D3B8DF2-580F-4DDC-B189-2CC2DA9CAA04}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -190,16 +240,26 @@ Global
 		{57E7FC2D-6403-4690-8FE3-7EE1EB642630} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}
 		{0FCFAD52-30B7-4767-95A2-34FD295D31F4} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}
 		{2A888AE7-A822-4FF5-B6F0-9C7FEB46D117} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}
+		{AA7B5256-A933-4F5F-9E66-AFDADD386BAF} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}
 		{DB976968-CBB9-4134-88C6-5E682D050809} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}
 		{F0316E81-8B9C-44F3-86F5-4C812F0734A3} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}
 		{38FD827A-C96C-41CF-A514-CDAD16AE4802} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}
 		{E33BB464-D65A-46DB-9BC1-836A5D126196} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}
 		{8D82C57C-D809-4E65-BDFF-E73C13DA37BC} = {145B4B2E-5EF8-46F2-A596-E1043BB22873}
 		{11F31E64-4000-47F3-AE19-C83EB4EC0ED8} = {145B4B2E-5EF8-46F2-A596-E1043BB22873}
+		{92D3020D-AB3C-44FC-BC22-ECFF8E83645D} = {145B4B2E-5EF8-46F2-A596-E1043BB22873}
 		{17069DE3-C00A-4A4C-9FAF-557F2E8A6197} = {7841027C-6B57-4756-A757-8B19ECA0D9C7}
 		{FC847978-9218-451E-BD07-910E11D59AD1} = {7841027C-6B57-4756-A757-8B19ECA0D9C7}
 		{98AA859A-14F1-465D-80D6-343A4075CC7B} = {7841027C-6B57-4756-A757-8B19ECA0D9C7}
 		{786ED1A9-1EFF-4BC4-A833-E680D9960F72} = {7841027C-6B57-4756-A757-8B19ECA0D9C7}
+		{AA699427-03F4-4247-A537-0BFB872BD177} = {6A8E1C6E-AED3-4791-8A4E-2F984E96C675}
+		{A9E863FB-3904-41CF-88D9-FEE8A0AE7D80} = {6A8E1C6E-AED3-4791-8A4E-2F984E96C675}
+		{6A8E1C6E-AED3-4791-8A4E-2F984E96C675} = {7016A2BA-7735-4FFB-9FFF-BB6A14A2CF9E}
+		{4A09D92F-DDA7-4FCF-9F8F-A5FBD4A5ADF8} = {21C29D7F-0441-4D31-8D83-56689F95B22A}
+		{A9E8F328-3B36-4DE5-96AC-6625F2C12664} = {21C29D7F-0441-4D31-8D83-56689F95B22A}
+		{21C29D7F-0441-4D31-8D83-56689F95B22A} = {7016A2BA-7735-4FFB-9FFF-BB6A14A2CF9E}
+		{4D3B8DF2-580F-4DDC-B189-2CC2DA9CAA04} = {1328089C-8717-4A25-9F71-65D7D0ECA031}
+		{1328089C-8717-4A25-9F71-65D7D0ECA031} = {7016A2BA-7735-4FFB-9FFF-BB6A14A2CF9E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F1EF65A2-61B3-45A3-9CDE-BD62218BE447}
diff --git a/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln b/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln
index 43717d104d4a4..379e66746afc1 100644
--- a/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln
+++ b/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln
@@ -49,6 +49,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims", ".
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography", "..\System.Security.Cryptography\ref\System.Security.Cryptography.csproj", "{15D0602C-AE8A-4B74-AD03-884A04F438E5}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{77A46CB6-B34E-4862-91A2-D03974CD99AA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{611334B0-BB85-4C75-BBB4-F0A03B64ACD9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{BEDBD417-762A-499A-AFF4-C1E08DBB1B3D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{6C71EED3-9905-424B-853F-4E7B5052A015}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A37AF272-36AC-41C7-8ED8-C55D7D7F2286}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AE12BA12-7BDB-4361-922F-AAA100384926}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A3A29B10-F45E-487B-A2A0-EA809B62AF9D}"
@@ -57,6 +67,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{633A5486-761
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D79781B1-8197-4641-9DE7-B9F22C71FBB9}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{F6945715-9534-4427-9DA8-83AE756B16A0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{467E7661-6164-4F9B-8FC7-71D8A7E888BB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{210A7BA3-683A-40D8-8FC2-96AE34E1E7D9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{A5203398-DB4E-47F0-BB0F-30B23FC0BF97}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -163,6 +181,26 @@ Global
 		{15D0602C-AE8A-4B74-AD03-884A04F438E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{15D0602C-AE8A-4B74-AD03-884A04F438E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15D0602C-AE8A-4B74-AD03-884A04F438E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77A46CB6-B34E-4862-91A2-D03974CD99AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77A46CB6-B34E-4862-91A2-D03974CD99AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77A46CB6-B34E-4862-91A2-D03974CD99AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77A46CB6-B34E-4862-91A2-D03974CD99AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{611334B0-BB85-4C75-BBB4-F0A03B64ACD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{611334B0-BB85-4C75-BBB4-F0A03B64ACD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{611334B0-BB85-4C75-BBB4-F0A03B64ACD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{611334B0-BB85-4C75-BBB4-F0A03B64ACD9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEDBD417-762A-499A-AFF4-C1E08DBB1B3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEDBD417-762A-499A-AFF4-C1E08DBB1B3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEDBD417-762A-499A-AFF4-C1E08DBB1B3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEDBD417-762A-499A-AFF4-C1E08DBB1B3D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C71EED3-9905-424B-853F-4E7B5052A015}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C71EED3-9905-424B-853F-4E7B5052A015}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C71EED3-9905-424B-853F-4E7B5052A015}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C71EED3-9905-424B-853F-4E7B5052A015}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A37AF272-36AC-41C7-8ED8-C55D7D7F2286}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A37AF272-36AC-41C7-8ED8-C55D7D7F2286}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A37AF272-36AC-41C7-8ED8-C55D7D7F2286}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A37AF272-36AC-41C7-8ED8-C55D7D7F2286}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -193,6 +231,14 @@ Global
 		{E334C95C-CF2A-4E1A-BD1F-1C61A87CD703} = {D79781B1-8197-4641-9DE7-B9F22C71FBB9}
 		{48A9D75A-BB0F-425F-A1B0-25741CB85E57} = {D79781B1-8197-4641-9DE7-B9F22C71FBB9}
 		{154F91AC-8E70-49E6-9C97-0DDBD50AFB56} = {D79781B1-8197-4641-9DE7-B9F22C71FBB9}
+		{77A46CB6-B34E-4862-91A2-D03974CD99AA} = {F6945715-9534-4427-9DA8-83AE756B16A0}
+		{611334B0-BB85-4C75-BBB4-F0A03B64ACD9} = {F6945715-9534-4427-9DA8-83AE756B16A0}
+		{F6945715-9534-4427-9DA8-83AE756B16A0} = {A5203398-DB4E-47F0-BB0F-30B23FC0BF97}
+		{BEDBD417-762A-499A-AFF4-C1E08DBB1B3D} = {467E7661-6164-4F9B-8FC7-71D8A7E888BB}
+		{6C71EED3-9905-424B-853F-4E7B5052A015} = {467E7661-6164-4F9B-8FC7-71D8A7E888BB}
+		{467E7661-6164-4F9B-8FC7-71D8A7E888BB} = {A5203398-DB4E-47F0-BB0F-30B23FC0BF97}
+		{A37AF272-36AC-41C7-8ED8-C55D7D7F2286} = {210A7BA3-683A-40D8-8FC2-96AE34E1E7D9}
+		{210A7BA3-683A-40D8-8FC2-96AE34E1E7D9} = {A5203398-DB4E-47F0-BB0F-30B23FC0BF97}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {19365E8B-E996-4E55-B468-A126849865D8}
diff --git a/src/libraries/System.Net.Mail/System.Net.Mail.sln b/src/libraries/System.Net.Mail/System.Net.Mail.sln
index c2d84c2b911c3..5ed784cddea1e 100644
--- a/src/libraries/System.Net.Mail/System.Net.Mail.sln
+++ b/src/libraries/System.Net.Mail/System.Net.Mail.sln
@@ -57,6 +57,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.W
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\ref\System.Threading.csproj", "{24628602-C0E5-41CA-9570-C02E5E0FC595}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{09BD8BD6-3778-4891-B739-4B04C280E62D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{D2B494E0-8C01-4084-AABD-252CB298C104}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{2CBF9CB9-A479-4263-8C2C-BB90D6EA9E2B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{0B0672B5-A662-47F9-8B90-030301334DB8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{D6533833-9DA1-4AFC-969A-DFC655AF855B}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DFA479C6-DDF9-4AE0-91BB-08041FF1B7C8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A08D08E8-610F-47A0-8747-01223F9430C5}"
@@ -65,6 +75,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{04FF7F43-59F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{461D78A2-743F-40F0-B301-274F2687D84F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{514636E4-391A-44B6-85BF-1D3BF7D2D129}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{AC1DFAB7-579E-4773-A72C-2AD5EAB081A0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{B1895DC0-F72B-4DBB-BE05-A7DE827BD240}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{F5D945B7-D7CD-4F03-A689-7EADB562C2E3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -187,6 +205,26 @@ Global
 		{24628602-C0E5-41CA-9570-C02E5E0FC595}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{24628602-C0E5-41CA-9570-C02E5E0FC595}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{24628602-C0E5-41CA-9570-C02E5E0FC595}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09BD8BD6-3778-4891-B739-4B04C280E62D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09BD8BD6-3778-4891-B739-4B04C280E62D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09BD8BD6-3778-4891-B739-4B04C280E62D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09BD8BD6-3778-4891-B739-4B04C280E62D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2B494E0-8C01-4084-AABD-252CB298C104}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2B494E0-8C01-4084-AABD-252CB298C104}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2B494E0-8C01-4084-AABD-252CB298C104}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2B494E0-8C01-4084-AABD-252CB298C104}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CBF9CB9-A479-4263-8C2C-BB90D6EA9E2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CBF9CB9-A479-4263-8C2C-BB90D6EA9E2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CBF9CB9-A479-4263-8C2C-BB90D6EA9E2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CBF9CB9-A479-4263-8C2C-BB90D6EA9E2B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B0672B5-A662-47F9-8B90-030301334DB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B0672B5-A662-47F9-8B90-030301334DB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B0672B5-A662-47F9-8B90-030301334DB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B0672B5-A662-47F9-8B90-030301334DB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6533833-9DA1-4AFC-969A-DFC655AF855B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6533833-9DA1-4AFC-969A-DFC655AF855B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6533833-9DA1-4AFC-969A-DFC655AF855B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6533833-9DA1-4AFC-969A-DFC655AF855B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -221,6 +259,14 @@ Global
 		{628EF453-C5BA-437B-9467-A037E19C945E} = {461D78A2-743F-40F0-B301-274F2687D84F}
 		{34D84D8A-9D29-4ED5-B46D-A772E521E2CF} = {461D78A2-743F-40F0-B301-274F2687D84F}
 		{301EA337-1D9A-47EF-966B-0ED0568C569A} = {461D78A2-743F-40F0-B301-274F2687D84F}
+		{09BD8BD6-3778-4891-B739-4B04C280E62D} = {514636E4-391A-44B6-85BF-1D3BF7D2D129}
+		{D2B494E0-8C01-4084-AABD-252CB298C104} = {514636E4-391A-44B6-85BF-1D3BF7D2D129}
+		{514636E4-391A-44B6-85BF-1D3BF7D2D129} = {F5D945B7-D7CD-4F03-A689-7EADB562C2E3}
+		{2CBF9CB9-A479-4263-8C2C-BB90D6EA9E2B} = {AC1DFAB7-579E-4773-A72C-2AD5EAB081A0}
+		{0B0672B5-A662-47F9-8B90-030301334DB8} = {AC1DFAB7-579E-4773-A72C-2AD5EAB081A0}
+		{AC1DFAB7-579E-4773-A72C-2AD5EAB081A0} = {F5D945B7-D7CD-4F03-A689-7EADB562C2E3}
+		{D6533833-9DA1-4AFC-969A-DFC655AF855B} = {B1895DC0-F72B-4DBB-BE05-A7DE827BD240}
+		{B1895DC0-F72B-4DBB-BE05-A7DE827BD240} = {F5D945B7-D7CD-4F03-A689-7EADB562C2E3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5A7D0500-9878-41E4-B10B-94A5E2CCE8B8}
diff --git a/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln b/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln
index 3874ca182c000..e41d2d150b091 100644
--- a/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln
+++ b/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln
@@ -25,6 +25,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{149A3A68-0124-42FF-BB87-EBEC6D035251}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{85113E09-04F4-436C-BF0E-F49BAD412DF6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{9E3990D7-1753-49E4-933A-42D4C2AEDE86}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{F9D21D9E-65F0-42BD-A0B9-EF36E327BAD1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{A0C2EC78-22E5-4605-92E1-874F5D2F37D5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{185F10CA-1ABA-426A-94E7-E3DCA6A725B3}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6E7B2B93-21B0-457F-84C3-AE62DABC73E2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{47DBE178-9476-4595-9C71-424D54314C2E}"
@@ -33,6 +43,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3DDE175F-17B
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{851CDB4C-B092-466E-93BA-D554120B182B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{2B391C1C-2A28-4B3C-9441-724C5CE77C8D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D4FB5A04-987F-437E-A108-E6770D77E259}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{CCA739F2-1D4E-440E-B87E-A8DFC99AFC30}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{69EAAE6B-2E95-49CE-9260-153E27BC8A6B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,6 +109,26 @@ Global
 		{149A3A68-0124-42FF-BB87-EBEC6D035251}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{149A3A68-0124-42FF-BB87-EBEC6D035251}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{149A3A68-0124-42FF-BB87-EBEC6D035251}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85113E09-04F4-436C-BF0E-F49BAD412DF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85113E09-04F4-436C-BF0E-F49BAD412DF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85113E09-04F4-436C-BF0E-F49BAD412DF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85113E09-04F4-436C-BF0E-F49BAD412DF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E3990D7-1753-49E4-933A-42D4C2AEDE86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E3990D7-1753-49E4-933A-42D4C2AEDE86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E3990D7-1753-49E4-933A-42D4C2AEDE86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E3990D7-1753-49E4-933A-42D4C2AEDE86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9D21D9E-65F0-42BD-A0B9-EF36E327BAD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9D21D9E-65F0-42BD-A0B9-EF36E327BAD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9D21D9E-65F0-42BD-A0B9-EF36E327BAD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9D21D9E-65F0-42BD-A0B9-EF36E327BAD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0C2EC78-22E5-4605-92E1-874F5D2F37D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0C2EC78-22E5-4605-92E1-874F5D2F37D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0C2EC78-22E5-4605-92E1-874F5D2F37D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0C2EC78-22E5-4605-92E1-874F5D2F37D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{185F10CA-1ABA-426A-94E7-E3DCA6A725B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{185F10CA-1ABA-426A-94E7-E3DCA6A725B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{185F10CA-1ABA-426A-94E7-E3DCA6A725B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{185F10CA-1ABA-426A-94E7-E3DCA6A725B3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -109,6 +147,14 @@ Global
 		{3AE9C5DE-A09B-401F-B6B6-790854166871} = {851CDB4C-B092-466E-93BA-D554120B182B}
 		{FC0BD396-0280-434B-913B-A17D87892A78} = {851CDB4C-B092-466E-93BA-D554120B182B}
 		{A8357213-6A4D-463F-8364-70ED86147098} = {851CDB4C-B092-466E-93BA-D554120B182B}
+		{85113E09-04F4-436C-BF0E-F49BAD412DF6} = {2B391C1C-2A28-4B3C-9441-724C5CE77C8D}
+		{9E3990D7-1753-49E4-933A-42D4C2AEDE86} = {2B391C1C-2A28-4B3C-9441-724C5CE77C8D}
+		{2B391C1C-2A28-4B3C-9441-724C5CE77C8D} = {69EAAE6B-2E95-49CE-9260-153E27BC8A6B}
+		{F9D21D9E-65F0-42BD-A0B9-EF36E327BAD1} = {D4FB5A04-987F-437E-A108-E6770D77E259}
+		{A0C2EC78-22E5-4605-92E1-874F5D2F37D5} = {D4FB5A04-987F-437E-A108-E6770D77E259}
+		{D4FB5A04-987F-437E-A108-E6770D77E259} = {69EAAE6B-2E95-49CE-9260-153E27BC8A6B}
+		{185F10CA-1ABA-426A-94E7-E3DCA6A725B3} = {CCA739F2-1D4E-440E-B87E-A8DFC99AFC30}
+		{CCA739F2-1D4E-440E-B87E-A8DFC99AFC30} = {69EAAE6B-2E95-49CE-9260-153E27BC8A6B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9CA07406-6BA5-454C-8C65-3396A977F8A8}
diff --git a/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln b/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
index 1c187b6edb600..570f1e0a40626 100644
--- a/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
+++ b/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
@@ -23,6 +23,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{2F199597-D0CF-49F4-B6AC-136568ACA101}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{76FE6990-FDCC-407C-A141-17333897C85A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{6E745F77-E9BA-4CF3-8248-3ED452B75658}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{CA47643B-4411-4398-BA9E-F2A456D75C5C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{32E6831D-EA39-427A-B371-C5192D9F461E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{626030A4-7D94-47A1-B755-DCCCCB7C9D7F}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{33058B90-33C6-4731-AF47-DC7678DC2739}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{01C6C981-C56F-453F-B099-C8B9DF61CDEB}"
@@ -31,6 +41,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A3CAA996-BF7
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{575528E7-33D8-4375-8B5A-D88215FEE447}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{38149F91-88CE-43C8-A78A-4677279A9CE6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{7340AEBE-76C9-49D2-8E1E-578DC1CE0379}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{72B5FB5E-4E9C-4D26-ABE7-AB51F0386E80}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{88369369-5B08-41E7-8D5F-08C0920185FE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -85,6 +103,26 @@ Global
 		{2F199597-D0CF-49F4-B6AC-136568ACA101}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2F199597-D0CF-49F4-B6AC-136568ACA101}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2F199597-D0CF-49F4-B6AC-136568ACA101}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76FE6990-FDCC-407C-A141-17333897C85A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76FE6990-FDCC-407C-A141-17333897C85A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76FE6990-FDCC-407C-A141-17333897C85A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76FE6990-FDCC-407C-A141-17333897C85A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E745F77-E9BA-4CF3-8248-3ED452B75658}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E745F77-E9BA-4CF3-8248-3ED452B75658}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E745F77-E9BA-4CF3-8248-3ED452B75658}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E745F77-E9BA-4CF3-8248-3ED452B75658}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA47643B-4411-4398-BA9E-F2A456D75C5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA47643B-4411-4398-BA9E-F2A456D75C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA47643B-4411-4398-BA9E-F2A456D75C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA47643B-4411-4398-BA9E-F2A456D75C5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32E6831D-EA39-427A-B371-C5192D9F461E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32E6831D-EA39-427A-B371-C5192D9F461E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32E6831D-EA39-427A-B371-C5192D9F461E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32E6831D-EA39-427A-B371-C5192D9F461E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{626030A4-7D94-47A1-B755-DCCCCB7C9D7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{626030A4-7D94-47A1-B755-DCCCCB7C9D7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{626030A4-7D94-47A1-B755-DCCCCB7C9D7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{626030A4-7D94-47A1-B755-DCCCCB7C9D7F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -102,6 +140,14 @@ Global
 		{DDE2D5F1-C566-41EA-9482-E587A7DEF254} = {575528E7-33D8-4375-8B5A-D88215FEE447}
 		{D6600B0A-FEE0-4D1E-B42F-88EB016403CF} = {575528E7-33D8-4375-8B5A-D88215FEE447}
 		{1E0ED0DE-76B3-402F-8029-C432E638CE0C} = {575528E7-33D8-4375-8B5A-D88215FEE447}
+		{76FE6990-FDCC-407C-A141-17333897C85A} = {38149F91-88CE-43C8-A78A-4677279A9CE6}
+		{6E745F77-E9BA-4CF3-8248-3ED452B75658} = {38149F91-88CE-43C8-A78A-4677279A9CE6}
+		{38149F91-88CE-43C8-A78A-4677279A9CE6} = {88369369-5B08-41E7-8D5F-08C0920185FE}
+		{CA47643B-4411-4398-BA9E-F2A456D75C5C} = {7340AEBE-76C9-49D2-8E1E-578DC1CE0379}
+		{32E6831D-EA39-427A-B371-C5192D9F461E} = {7340AEBE-76C9-49D2-8E1E-578DC1CE0379}
+		{7340AEBE-76C9-49D2-8E1E-578DC1CE0379} = {88369369-5B08-41E7-8D5F-08C0920185FE}
+		{626030A4-7D94-47A1-B755-DCCCCB7C9D7F} = {72B5FB5E-4E9C-4D26-ABE7-AB51F0386E80}
+		{72B5FB5E-4E9C-4D26-ABE7-AB51F0386E80} = {88369369-5B08-41E7-8D5F-08C0920185FE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6749EC2E-042F-4132-9B0A-82ED7F56513C}
diff --git a/src/libraries/System.Net.Ping/System.Net.Ping.sln b/src/libraries/System.Net.Ping/System.Net.Ping.sln
index d1e975b671ad1..aea9d6c1b777c 100644
--- a/src/libraries/System.Net.Ping/System.Net.Ping.sln
+++ b/src/libraries/System.Net.Ping/System.Net.Ping.sln
@@ -35,6 +35,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\ref\System.Threading.csproj", "{200D7714-61DF-490B-8A37-ABB93B3A2861}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{2C09100E-DBC4-4462-8D86-E429E2EC8C5C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{1E15AD35-9948-4D20-A2A6-1653FDCCB903}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{06C415F2-23A7-43AF-977C-8E6E89256705}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{F4DDF4DE-0D28-497B-83CB-8BE18A890124}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{8697D398-2A0F-4D86-812A-694B25BFF61D}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FABDD2DA-5365-4FD2-8C67-4C643E618CE9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AAB0D01D-C3A4-4E09-9BFD-CBC737A3CA73}"
@@ -43,6 +53,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A687595D-ACC
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D26792B6-6D00-4CC0-B60B-7028F377BD4F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{8A7756DC-E949-418A-93A2-C4BE96CD25ED}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{A91018DA-C721-4F45-8817-2F8A16DD9407}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{CE3FD391-E196-4E6F-92F8-4172334834AD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{4B868FF8-F623-47AC-A6BC-6BCA4A6C4FBC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -121,6 +139,26 @@ Global
 		{200D7714-61DF-490B-8A37-ABB93B3A2861}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{200D7714-61DF-490B-8A37-ABB93B3A2861}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{200D7714-61DF-490B-8A37-ABB93B3A2861}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C09100E-DBC4-4462-8D86-E429E2EC8C5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C09100E-DBC4-4462-8D86-E429E2EC8C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C09100E-DBC4-4462-8D86-E429E2EC8C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C09100E-DBC4-4462-8D86-E429E2EC8C5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E15AD35-9948-4D20-A2A6-1653FDCCB903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E15AD35-9948-4D20-A2A6-1653FDCCB903}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E15AD35-9948-4D20-A2A6-1653FDCCB903}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E15AD35-9948-4D20-A2A6-1653FDCCB903}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06C415F2-23A7-43AF-977C-8E6E89256705}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06C415F2-23A7-43AF-977C-8E6E89256705}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06C415F2-23A7-43AF-977C-8E6E89256705}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06C415F2-23A7-43AF-977C-8E6E89256705}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4DDF4DE-0D28-497B-83CB-8BE18A890124}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4DDF4DE-0D28-497B-83CB-8BE18A890124}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4DDF4DE-0D28-497B-83CB-8BE18A890124}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4DDF4DE-0D28-497B-83CB-8BE18A890124}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8697D398-2A0F-4D86-812A-694B25BFF61D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8697D398-2A0F-4D86-812A-694B25BFF61D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8697D398-2A0F-4D86-812A-694B25BFF61D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8697D398-2A0F-4D86-812A-694B25BFF61D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -144,6 +182,14 @@ Global
 		{85E42E20-BD03-4417-8E0D-693CE3ED9BFE} = {D26792B6-6D00-4CC0-B60B-7028F377BD4F}
 		{26E69A05-FCF8-4D01-A93A-F97FE4B92D74} = {D26792B6-6D00-4CC0-B60B-7028F377BD4F}
 		{B59DB44D-8E1E-4F62-A223-E3AC71BB0370} = {D26792B6-6D00-4CC0-B60B-7028F377BD4F}
+		{2C09100E-DBC4-4462-8D86-E429E2EC8C5C} = {8A7756DC-E949-418A-93A2-C4BE96CD25ED}
+		{1E15AD35-9948-4D20-A2A6-1653FDCCB903} = {8A7756DC-E949-418A-93A2-C4BE96CD25ED}
+		{8A7756DC-E949-418A-93A2-C4BE96CD25ED} = {4B868FF8-F623-47AC-A6BC-6BCA4A6C4FBC}
+		{06C415F2-23A7-43AF-977C-8E6E89256705} = {A91018DA-C721-4F45-8817-2F8A16DD9407}
+		{F4DDF4DE-0D28-497B-83CB-8BE18A890124} = {A91018DA-C721-4F45-8817-2F8A16DD9407}
+		{A91018DA-C721-4F45-8817-2F8A16DD9407} = {4B868FF8-F623-47AC-A6BC-6BCA4A6C4FBC}
+		{8697D398-2A0F-4D86-812A-694B25BFF61D} = {CE3FD391-E196-4E6F-92F8-4172334834AD}
+		{CE3FD391-E196-4E6F-92F8-4172334834AD} = {4B868FF8-F623-47AC-A6BC-6BCA4A6C4FBC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {23612E2C-7AC3-4D7B-812D-44BB88E94278}
diff --git a/src/libraries/System.Net.Primitives/System.Net.Primitives.sln b/src/libraries/System.Net.Primitives/System.Net.Primitives.sln
index c48860220438c..9f96cbb4b5597 100644
--- a/src/libraries/System.Net.Primitives/System.Net.Primitives.sln
+++ b/src/libraries/System.Net.Primitives/System.Net.Primitives.sln
@@ -25,6 +25,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{B7492470-68D0-4938-8048-BBDD2EC2541E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{BC5985B8-25E7-41FB-8D83-7D0A9960B90D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{01CE4000-E9A0-48CC-9156-582213B37397}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{EE51F074-6B3A-4A7B-BA03-06057024F1DC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{D2F0AD86-F328-4FE8-A1CB-AEA11BE314BC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{870C116F-8261-440E-A677-2195E858A662}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{909A147A-476E-4E34-A931-C2C65FD656A6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{212A5562-EFE7-4220-94EC-6B49C0A6DCEF}"
@@ -33,6 +43,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{97419593-C13
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6DD9FC21-AB33-4068-BC80-B4B89B7C99C9}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{755EE99F-4EA2-4CB1-868F-3786B3553EE3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{84B45470-6F76-49DD-9782-229F451C21E8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{D1AB3906-69CC-4712-BC07-AAA4527DD38B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{D3E16210-AB55-4459-B9E2-FE4089558D5E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,6 +109,26 @@ Global
 		{B7492470-68D0-4938-8048-BBDD2EC2541E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B7492470-68D0-4938-8048-BBDD2EC2541E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B7492470-68D0-4938-8048-BBDD2EC2541E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC5985B8-25E7-41FB-8D83-7D0A9960B90D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC5985B8-25E7-41FB-8D83-7D0A9960B90D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC5985B8-25E7-41FB-8D83-7D0A9960B90D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC5985B8-25E7-41FB-8D83-7D0A9960B90D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01CE4000-E9A0-48CC-9156-582213B37397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01CE4000-E9A0-48CC-9156-582213B37397}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01CE4000-E9A0-48CC-9156-582213B37397}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01CE4000-E9A0-48CC-9156-582213B37397}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE51F074-6B3A-4A7B-BA03-06057024F1DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE51F074-6B3A-4A7B-BA03-06057024F1DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE51F074-6B3A-4A7B-BA03-06057024F1DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE51F074-6B3A-4A7B-BA03-06057024F1DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2F0AD86-F328-4FE8-A1CB-AEA11BE314BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2F0AD86-F328-4FE8-A1CB-AEA11BE314BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2F0AD86-F328-4FE8-A1CB-AEA11BE314BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2F0AD86-F328-4FE8-A1CB-AEA11BE314BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{870C116F-8261-440E-A677-2195E858A662}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{870C116F-8261-440E-A677-2195E858A662}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{870C116F-8261-440E-A677-2195E858A662}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{870C116F-8261-440E-A677-2195E858A662}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -109,6 +147,14 @@ Global
 		{2F6BED4C-3D02-4D55-83FA-81F6368260C5} = {6DD9FC21-AB33-4068-BC80-B4B89B7C99C9}
 		{780F4FEF-204D-4EE0-8072-884A9EF7FE9E} = {6DD9FC21-AB33-4068-BC80-B4B89B7C99C9}
 		{160E40E8-0148-4D87-86D2-1F1918BD36F0} = {6DD9FC21-AB33-4068-BC80-B4B89B7C99C9}
+		{BC5985B8-25E7-41FB-8D83-7D0A9960B90D} = {755EE99F-4EA2-4CB1-868F-3786B3553EE3}
+		{01CE4000-E9A0-48CC-9156-582213B37397} = {755EE99F-4EA2-4CB1-868F-3786B3553EE3}
+		{755EE99F-4EA2-4CB1-868F-3786B3553EE3} = {D3E16210-AB55-4459-B9E2-FE4089558D5E}
+		{EE51F074-6B3A-4A7B-BA03-06057024F1DC} = {84B45470-6F76-49DD-9782-229F451C21E8}
+		{D2F0AD86-F328-4FE8-A1CB-AEA11BE314BC} = {84B45470-6F76-49DD-9782-229F451C21E8}
+		{84B45470-6F76-49DD-9782-229F451C21E8} = {D3E16210-AB55-4459-B9E2-FE4089558D5E}
+		{870C116F-8261-440E-A677-2195E858A662} = {D1AB3906-69CC-4712-BC07-AAA4527DD38B}
+		{D1AB3906-69CC-4712-BC07-AAA4527DD38B} = {D3E16210-AB55-4459-B9E2-FE4089558D5E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E0D36CFB-AD15-487D-A647-F12B577FC5DF}
diff --git a/src/libraries/System.Net.Quic/System.Net.Quic.sln b/src/libraries/System.Net.Quic/System.Net.Quic.sln
index 2fe77a3359170..e6d0df2c3c71c 100644
--- a/src/libraries/System.Net.Quic/System.Net.Quic.sln
+++ b/src/libraries/System.Net.Quic/System.Net.Quic.sln
@@ -37,6 +37,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography", "..\System.Security.Cryptography\ref\System.Security.Cryptography.csproj", "{569A37E6-CEC4-4AAA-A364-65A70CAAB8F3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{03F35F42-0689-4C45-917A-4051F074976A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{EC456478-DABF-462B-83F8-A5E646CECEFE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{E70F79E0-F411-4368-8DC3-C8C60AD3FE9E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{A978AD93-842E-4858-A3E6-06016CD1CA5F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{594B8C80-7605-4BEA-BFEB-86643C63294B}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{12C4206E-D19B-44BF-8002-6236D65AAE1B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{538F3900-95BF-423D-9912-F94B0ECE463C}"
@@ -45,6 +55,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8EF7F530-1F4
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{AA7C6283-6473-4B71-8877-CAB8D75F9469}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{52ACCDCF-33C4-4966-8AFE-B24436F201EF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{B8C57DA7-E219-4B90-A8E2-FC9DEBAE2046}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{3484E61B-8CDD-45D7-96A9-F851C952984F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{F8F79BAF-C4C7-4AAF-A26E-9A8F5931AC0F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -127,6 +145,26 @@ Global
 		{569A37E6-CEC4-4AAA-A364-65A70CAAB8F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{569A37E6-CEC4-4AAA-A364-65A70CAAB8F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{569A37E6-CEC4-4AAA-A364-65A70CAAB8F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03F35F42-0689-4C45-917A-4051F074976A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03F35F42-0689-4C45-917A-4051F074976A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03F35F42-0689-4C45-917A-4051F074976A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03F35F42-0689-4C45-917A-4051F074976A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC456478-DABF-462B-83F8-A5E646CECEFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC456478-DABF-462B-83F8-A5E646CECEFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC456478-DABF-462B-83F8-A5E646CECEFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC456478-DABF-462B-83F8-A5E646CECEFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E70F79E0-F411-4368-8DC3-C8C60AD3FE9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E70F79E0-F411-4368-8DC3-C8C60AD3FE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E70F79E0-F411-4368-8DC3-C8C60AD3FE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E70F79E0-F411-4368-8DC3-C8C60AD3FE9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A978AD93-842E-4858-A3E6-06016CD1CA5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A978AD93-842E-4858-A3E6-06016CD1CA5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A978AD93-842E-4858-A3E6-06016CD1CA5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A978AD93-842E-4858-A3E6-06016CD1CA5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{594B8C80-7605-4BEA-BFEB-86643C63294B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{594B8C80-7605-4BEA-BFEB-86643C63294B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{594B8C80-7605-4BEA-BFEB-86643C63294B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{594B8C80-7605-4BEA-BFEB-86643C63294B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -151,6 +189,14 @@ Global
 		{1FF213AF-FCCA-419E-A686-321178BC7AD3} = {AA7C6283-6473-4B71-8877-CAB8D75F9469}
 		{C1EDF9E8-5584-47B7-A7D5-C034134DEEC1} = {AA7C6283-6473-4B71-8877-CAB8D75F9469}
 		{E1D4C4F2-B830-4E87-B10D-ADC667213957} = {AA7C6283-6473-4B71-8877-CAB8D75F9469}
+		{03F35F42-0689-4C45-917A-4051F074976A} = {52ACCDCF-33C4-4966-8AFE-B24436F201EF}
+		{EC456478-DABF-462B-83F8-A5E646CECEFE} = {52ACCDCF-33C4-4966-8AFE-B24436F201EF}
+		{52ACCDCF-33C4-4966-8AFE-B24436F201EF} = {F8F79BAF-C4C7-4AAF-A26E-9A8F5931AC0F}
+		{E70F79E0-F411-4368-8DC3-C8C60AD3FE9E} = {B8C57DA7-E219-4B90-A8E2-FC9DEBAE2046}
+		{A978AD93-842E-4858-A3E6-06016CD1CA5F} = {B8C57DA7-E219-4B90-A8E2-FC9DEBAE2046}
+		{B8C57DA7-E219-4B90-A8E2-FC9DEBAE2046} = {F8F79BAF-C4C7-4AAF-A26E-9A8F5931AC0F}
+		{594B8C80-7605-4BEA-BFEB-86643C63294B} = {3484E61B-8CDD-45D7-96A9-F851C952984F}
+		{3484E61B-8CDD-45D7-96A9-F851C952984F} = {F8F79BAF-C4C7-4AAF-A26E-9A8F5931AC0F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4B59ACCA-7F0C-4062-AA79-B3D75EFACCCD}
diff --git a/src/libraries/System.Net.Requests/System.Net.Requests.sln b/src/libraries/System.Net.Requests/System.Net.Requests.sln
index 64c603eb5f3ab..890e94e5f3376 100644
--- a/src/libraries/System.Net.Requests/System.Net.Requests.sln
+++ b/src/libraries/System.Net.Requests/System.Net.Requests.sln
@@ -47,6 +47,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography", "..\System.Security.Cryptography\ref\System.Security.Cryptography.csproj", "{FECA1242-D76F-4CA0-A0E7-289209B2BCC0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{D865D8D5-7D19-4D98-BED2-3D7B4FC3C4B2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{CAEAB457-89E5-42DD-9963-321601FAE936}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{83BB00EB-51E0-4ED9-858E-1A28322EDE01}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{6AE19FC5-D4BA-4C1A-87B9-87A9FCC0883B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{F01F38EB-B9A4-46EA-B11C-AE5C65BD0371}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2E80965D-0AB1-451E-AFE5-E4CAF49EE8E3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DB20495E-C9F0-4640-85A6-ACEF17C21670}"
@@ -55,6 +65,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BE29C1CE-D2B
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BCB9D4DE-1EC1-4826-A80F-E4D2E960D98D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{DC7F204D-9592-4EDD-9ED0-21B2BF53FA1F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{8F842012-E5B7-4806-BF53-7F1EDAC7F4DD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{213121F9-0C28-4322-A0F0-07B6C5818923}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0CCB356A-4A4E-4CDB-8407-BF91880E5E9A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -157,6 +175,26 @@ Global
 		{FECA1242-D76F-4CA0-A0E7-289209B2BCC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FECA1242-D76F-4CA0-A0E7-289209B2BCC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FECA1242-D76F-4CA0-A0E7-289209B2BCC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D865D8D5-7D19-4D98-BED2-3D7B4FC3C4B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D865D8D5-7D19-4D98-BED2-3D7B4FC3C4B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D865D8D5-7D19-4D98-BED2-3D7B4FC3C4B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D865D8D5-7D19-4D98-BED2-3D7B4FC3C4B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAEAB457-89E5-42DD-9963-321601FAE936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAEAB457-89E5-42DD-9963-321601FAE936}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAEAB457-89E5-42DD-9963-321601FAE936}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAEAB457-89E5-42DD-9963-321601FAE936}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83BB00EB-51E0-4ED9-858E-1A28322EDE01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83BB00EB-51E0-4ED9-858E-1A28322EDE01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83BB00EB-51E0-4ED9-858E-1A28322EDE01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83BB00EB-51E0-4ED9-858E-1A28322EDE01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AE19FC5-D4BA-4C1A-87B9-87A9FCC0883B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AE19FC5-D4BA-4C1A-87B9-87A9FCC0883B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AE19FC5-D4BA-4C1A-87B9-87A9FCC0883B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6AE19FC5-D4BA-4C1A-87B9-87A9FCC0883B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F01F38EB-B9A4-46EA-B11C-AE5C65BD0371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F01F38EB-B9A4-46EA-B11C-AE5C65BD0371}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F01F38EB-B9A4-46EA-B11C-AE5C65BD0371}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F01F38EB-B9A4-46EA-B11C-AE5C65BD0371}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -186,6 +224,14 @@ Global
 		{BE1267C9-2847-4BD0-BBC9-B9ABEB567F08} = {BCB9D4DE-1EC1-4826-A80F-E4D2E960D98D}
 		{622D51A8-954A-401B-91FD-21E650F2DE46} = {BCB9D4DE-1EC1-4826-A80F-E4D2E960D98D}
 		{CE27441A-4D2F-4A63-8D02-148A0C51CA47} = {BCB9D4DE-1EC1-4826-A80F-E4D2E960D98D}
+		{D865D8D5-7D19-4D98-BED2-3D7B4FC3C4B2} = {DC7F204D-9592-4EDD-9ED0-21B2BF53FA1F}
+		{CAEAB457-89E5-42DD-9963-321601FAE936} = {DC7F204D-9592-4EDD-9ED0-21B2BF53FA1F}
+		{DC7F204D-9592-4EDD-9ED0-21B2BF53FA1F} = {0CCB356A-4A4E-4CDB-8407-BF91880E5E9A}
+		{83BB00EB-51E0-4ED9-858E-1A28322EDE01} = {8F842012-E5B7-4806-BF53-7F1EDAC7F4DD}
+		{6AE19FC5-D4BA-4C1A-87B9-87A9FCC0883B} = {8F842012-E5B7-4806-BF53-7F1EDAC7F4DD}
+		{8F842012-E5B7-4806-BF53-7F1EDAC7F4DD} = {0CCB356A-4A4E-4CDB-8407-BF91880E5E9A}
+		{F01F38EB-B9A4-46EA-B11C-AE5C65BD0371} = {213121F9-0C28-4322-A0F0-07B6C5818923}
+		{213121F9-0C28-4322-A0F0-07B6C5818923} = {0CCB356A-4A4E-4CDB-8407-BF91880E5E9A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D33CD477-CBDE-47CC-BDAB-7E9469CE3549}
diff --git a/src/libraries/System.Net.Security/System.Net.Security.sln b/src/libraries/System.Net.Security/System.Net.Security.sln
index 9a5fb468dceaf..6eb84cc7b74e9 100644
--- a/src/libraries/System.Net.Security/System.Net.Security.sln
+++ b/src/libraries/System.Net.Security/System.Net.Security.sln
@@ -47,6 +47,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.W
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{BBC4D81D-C03E-455A-A294-0EC91581AC61}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{40C4360F-4012-4FBA-BA89-C06C8893AEDC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{754229AE-72DF-4B65-A72E-8AC7B23737DC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{3A8F9FAF-F801-4BCA-A3B8-0834526657DF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{1AADC546-C5B7-4247-9557-FFF414A8C639}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3F0D8988-4AFB-4AE2-9BA2-07E08765CCD1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{19C079E3-367B-480E-A46E-8D56D47F94EA}"
@@ -55,6 +65,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{70E29C1C-AC9
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{29A8D8F5-27EF-44B7-8C71-FC4E2D10EBBA}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{3E6CB661-AA4C-477E-8747-2D2852A5B3C4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{5AEC3A9F-78FF-4358-8B71-88294A4548C9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{8D0B384E-98D9-4B04-823D-69B81F8E7920}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{9CE6A0C3-971B-41D2-90E7-7ACC1D7AB598}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -157,6 +175,26 @@ Global
 		{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
+		{BBC4D81D-C03E-455A-A294-0EC91581AC61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBC4D81D-C03E-455A-A294-0EC91581AC61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBC4D81D-C03E-455A-A294-0EC91581AC61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBC4D81D-C03E-455A-A294-0EC91581AC61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40C4360F-4012-4FBA-BA89-C06C8893AEDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40C4360F-4012-4FBA-BA89-C06C8893AEDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40C4360F-4012-4FBA-BA89-C06C8893AEDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40C4360F-4012-4FBA-BA89-C06C8893AEDC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{754229AE-72DF-4B65-A72E-8AC7B23737DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{754229AE-72DF-4B65-A72E-8AC7B23737DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{754229AE-72DF-4B65-A72E-8AC7B23737DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{754229AE-72DF-4B65-A72E-8AC7B23737DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A8F9FAF-F801-4BCA-A3B8-0834526657DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A8F9FAF-F801-4BCA-A3B8-0834526657DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A8F9FAF-F801-4BCA-A3B8-0834526657DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A8F9FAF-F801-4BCA-A3B8-0834526657DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1AADC546-C5B7-4247-9557-FFF414A8C639}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1AADC546-C5B7-4247-9557-FFF414A8C639}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1AADC546-C5B7-4247-9557-FFF414A8C639}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1AADC546-C5B7-4247-9557-FFF414A8C639}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -186,6 +224,14 @@ Global
 		{756F6023-9F34-4E0E-8D9D-A561BFB8BFF8} = {29A8D8F5-27EF-44B7-8C71-FC4E2D10EBBA}
 		{F492B006-8C7C-471C-90C4-08C6A28F250A} = {29A8D8F5-27EF-44B7-8C71-FC4E2D10EBBA}
 		{BBF8C38F-E4A7-42E3-AEEB-8A2D08E9FF7E} = {29A8D8F5-27EF-44B7-8C71-FC4E2D10EBBA}
+		{BBC4D81D-C03E-455A-A294-0EC91581AC61} = {3E6CB661-AA4C-477E-8747-2D2852A5B3C4}
+		{40C4360F-4012-4FBA-BA89-C06C8893AEDC} = {3E6CB661-AA4C-477E-8747-2D2852A5B3C4}
+		{3E6CB661-AA4C-477E-8747-2D2852A5B3C4} = {9CE6A0C3-971B-41D2-90E7-7ACC1D7AB598}
+		{754229AE-72DF-4B65-A72E-8AC7B23737DC} = {5AEC3A9F-78FF-4358-8B71-88294A4548C9}
+		{3A8F9FAF-F801-4BCA-A3B8-0834526657DF} = {5AEC3A9F-78FF-4358-8B71-88294A4548C9}
+		{5AEC3A9F-78FF-4358-8B71-88294A4548C9} = {9CE6A0C3-971B-41D2-90E7-7ACC1D7AB598}
+		{1AADC546-C5B7-4247-9557-FFF414A8C639} = {8D0B384E-98D9-4B04-823D-69B81F8E7920}
+		{8D0B384E-98D9-4B04-823D-69B81F8E7920} = {9CE6A0C3-971B-41D2-90E7-7ACC1D7AB598}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4803416B-CE32-4730-905F-645A9B766D2B}
diff --git a/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln b/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln
index e9d8ddcb12473..8fc87f79d53f9 100644
--- a/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln
+++ b/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln
@@ -33,6 +33,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography", "..\System.Security.Cryptography\ref\System.Security.Cryptography.csproj", "{93B34712-6874-48FD-B5B2-A6A1001B3971}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{2987B1BD-0F93-4685-87EB-78A4D06B164E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{8310CB7A-8920-4F11-82A4-AD187FED940F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{E08549E3-429D-4008-AF68-7F3EA6B799ED}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{541CCC1F-D603-42E6-BC22-DC89AFE275AD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{F9A4DC11-DF60-486E-8C61-8A8A6A95C315}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{25E4C3E2-CEE1-4725-BB91-2AEB290C0953}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2A282996-B091-4BE8-BBD5-2F25A9C87A74}"
@@ -41,6 +51,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7D37D576-0E8
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{47FBD2B8-E991-449C-A4D7-33A636AD5C7F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0DC8ADC5-35B5-49C6-8538-0C708D0EEC3F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{42D9F460-E044-41F4-B78F-EDFF04838777}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{4FCF4CD6-43B0-4C11-A522-B74D3676BB9D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{E6FAE2F1-4EA3-43DF-A357-7D511EC8A733}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -115,6 +133,26 @@ Global
 		{93B34712-6874-48FD-B5B2-A6A1001B3971}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{93B34712-6874-48FD-B5B2-A6A1001B3971}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{93B34712-6874-48FD-B5B2-A6A1001B3971}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2987B1BD-0F93-4685-87EB-78A4D06B164E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2987B1BD-0F93-4685-87EB-78A4D06B164E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2987B1BD-0F93-4685-87EB-78A4D06B164E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2987B1BD-0F93-4685-87EB-78A4D06B164E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8310CB7A-8920-4F11-82A4-AD187FED940F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8310CB7A-8920-4F11-82A4-AD187FED940F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8310CB7A-8920-4F11-82A4-AD187FED940F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8310CB7A-8920-4F11-82A4-AD187FED940F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E08549E3-429D-4008-AF68-7F3EA6B799ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E08549E3-429D-4008-AF68-7F3EA6B799ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E08549E3-429D-4008-AF68-7F3EA6B799ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E08549E3-429D-4008-AF68-7F3EA6B799ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{541CCC1F-D603-42E6-BC22-DC89AFE275AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{541CCC1F-D603-42E6-BC22-DC89AFE275AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{541CCC1F-D603-42E6-BC22-DC89AFE275AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{541CCC1F-D603-42E6-BC22-DC89AFE275AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9A4DC11-DF60-486E-8C61-8A8A6A95C315}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9A4DC11-DF60-486E-8C61-8A8A6A95C315}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9A4DC11-DF60-486E-8C61-8A8A6A95C315}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9A4DC11-DF60-486E-8C61-8A8A6A95C315}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -137,6 +175,14 @@ Global
 		{3AE6973A-7E59-4F78-8B3F-FFBFEF38D89A} = {7D37D576-0E85-4EEA-9852-B80E14E1053C}
 		{11937440-4272-4B21-A536-230B62BD8D07} = {47FBD2B8-E991-449C-A4D7-33A636AD5C7F}
 		{A16FDE31-C850-412B-9541-3210D5D48AE1} = {47FBD2B8-E991-449C-A4D7-33A636AD5C7F}
+		{2987B1BD-0F93-4685-87EB-78A4D06B164E} = {0DC8ADC5-35B5-49C6-8538-0C708D0EEC3F}
+		{8310CB7A-8920-4F11-82A4-AD187FED940F} = {0DC8ADC5-35B5-49C6-8538-0C708D0EEC3F}
+		{0DC8ADC5-35B5-49C6-8538-0C708D0EEC3F} = {E6FAE2F1-4EA3-43DF-A357-7D511EC8A733}
+		{E08549E3-429D-4008-AF68-7F3EA6B799ED} = {42D9F460-E044-41F4-B78F-EDFF04838777}
+		{541CCC1F-D603-42E6-BC22-DC89AFE275AD} = {42D9F460-E044-41F4-B78F-EDFF04838777}
+		{42D9F460-E044-41F4-B78F-EDFF04838777} = {E6FAE2F1-4EA3-43DF-A357-7D511EC8A733}
+		{F9A4DC11-DF60-486E-8C61-8A8A6A95C315} = {4FCF4CD6-43B0-4C11-A522-B74D3676BB9D}
+		{4FCF4CD6-43B0-4C11-A522-B74D3676BB9D} = {E6FAE2F1-4EA3-43DF-A357-7D511EC8A733}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2DB03DED-414C-43AC-A6FD-748FEB8492EB}
diff --git a/src/libraries/System.Net.Sockets/System.Net.Sockets.sln b/src/libraries/System.Net.Sockets/System.Net.Sockets.sln
index da47efbb83bd1..edac3bf4a63f1 100644
--- a/src/libraries/System.Net.Sockets/System.Net.Sockets.sln
+++ b/src/libraries/System.Net.Sockets/System.Net.Sockets.sln
@@ -25,6 +25,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{F7A848B6-8307-4702-AEEE-20223FB73F29}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{FA256A4B-476D-4BCA-8E62-C2A11DF778CE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{6D7B425E-F07B-4572-98D8-728E3053E30F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{21411575-DD1A-45E1-8B10-6D4EA58684CD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{FA935CE3-6C83-4993-B565-95DF3129A43B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{C2011D8C-93D7-486E-8B01-0792262F4EF8}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FAD51322-998C-42D4-8FAA-EA479A3A0E82}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FC5FEA3E-33B9-4AEE-8E41-367BB73182EF}"
@@ -33,6 +43,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2C7108F0-035
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{51E336C9-CFE7-4459-B407-FD5D9E760D85}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CCBA19A8-17AB-402A-96E6-A1C92784EAC2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{99B1FC8E-726F-4DBF-887D-38AC7F63C230}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{2D08A54A-C557-444C-9D8D-0BF0E20CDE5A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{725DA203-1DB5-47D5-991A-8440E254BB23}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,6 +109,26 @@ Global
 		{F7A848B6-8307-4702-AEEE-20223FB73F29}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F7A848B6-8307-4702-AEEE-20223FB73F29}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F7A848B6-8307-4702-AEEE-20223FB73F29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA256A4B-476D-4BCA-8E62-C2A11DF778CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA256A4B-476D-4BCA-8E62-C2A11DF778CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA256A4B-476D-4BCA-8E62-C2A11DF778CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA256A4B-476D-4BCA-8E62-C2A11DF778CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D7B425E-F07B-4572-98D8-728E3053E30F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D7B425E-F07B-4572-98D8-728E3053E30F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D7B425E-F07B-4572-98D8-728E3053E30F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D7B425E-F07B-4572-98D8-728E3053E30F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21411575-DD1A-45E1-8B10-6D4EA58684CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21411575-DD1A-45E1-8B10-6D4EA58684CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21411575-DD1A-45E1-8B10-6D4EA58684CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21411575-DD1A-45E1-8B10-6D4EA58684CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA935CE3-6C83-4993-B565-95DF3129A43B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA935CE3-6C83-4993-B565-95DF3129A43B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA935CE3-6C83-4993-B565-95DF3129A43B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA935CE3-6C83-4993-B565-95DF3129A43B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2011D8C-93D7-486E-8B01-0792262F4EF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2011D8C-93D7-486E-8B01-0792262F4EF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2011D8C-93D7-486E-8B01-0792262F4EF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2011D8C-93D7-486E-8B01-0792262F4EF8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -109,6 +147,14 @@ Global
 		{85782EDD-90A7-4600-89EB-4E2C0AAAD446} = {51E336C9-CFE7-4459-B407-FD5D9E760D85}
 		{0CAE4AA4-2C81-4CA4-978A-F86DD25FA338} = {51E336C9-CFE7-4459-B407-FD5D9E760D85}
 		{3DD27643-568B-4BA1-82F2-FACFC8365836} = {51E336C9-CFE7-4459-B407-FD5D9E760D85}
+		{FA256A4B-476D-4BCA-8E62-C2A11DF778CE} = {CCBA19A8-17AB-402A-96E6-A1C92784EAC2}
+		{6D7B425E-F07B-4572-98D8-728E3053E30F} = {CCBA19A8-17AB-402A-96E6-A1C92784EAC2}
+		{CCBA19A8-17AB-402A-96E6-A1C92784EAC2} = {725DA203-1DB5-47D5-991A-8440E254BB23}
+		{21411575-DD1A-45E1-8B10-6D4EA58684CD} = {99B1FC8E-726F-4DBF-887D-38AC7F63C230}
+		{FA935CE3-6C83-4993-B565-95DF3129A43B} = {99B1FC8E-726F-4DBF-887D-38AC7F63C230}
+		{99B1FC8E-726F-4DBF-887D-38AC7F63C230} = {725DA203-1DB5-47D5-991A-8440E254BB23}
+		{C2011D8C-93D7-486E-8B01-0792262F4EF8} = {2D08A54A-C557-444C-9D8D-0BF0E20CDE5A}
+		{2D08A54A-C557-444C-9D8D-0BF0E20CDE5A} = {725DA203-1DB5-47D5-991A-8440E254BB23}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BA222465-FBD4-4377-8A8A-783BF85E01F7}
diff --git a/src/libraries/System.Net.WebClient/System.Net.WebClient.sln b/src/libraries/System.Net.WebClient/System.Net.WebClient.sln
index 7f5c729e62544..12241be11775e 100644
--- a/src/libraries/System.Net.WebClient/System.Net.WebClient.sln
+++ b/src/libraries/System.Net.WebClient/System.Net.WebClient.sln
@@ -51,6 +51,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\ref\System.Threading.csproj", "{1E3C8397-415C-46A7-B1BE-890F6FBEF34F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{E2C1D03D-DA79-4F28-9FF5-C8A5A94332B9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{5FC31AED-6A64-4CA0-B629-49FBA725843D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{1059C4DF-3F31-4105-B5D9-F61881B56E42}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{2AA6EEF3-1F26-4878-A4BD-B1F0C8CEACED}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{C02DBDB3-ED7C-4B26-B5A9-4D4C0985F722}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B8630BF1-D7F2-4E01-B030-A4E981428E42}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{33D25EB4-FCAA-41F3-B411-5946DEF7CEFE}"
@@ -59,6 +69,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ECCD7E4F-3B4
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{EBEFBFED-2B7D-4133-8D79-0F61D6E8A085}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{8AA84E5D-09EF-4E56-ACFD-6150B5B59EE6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{295A4D3E-99F5-428C-BFD4-953406F8E964}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C8FC1413-126F-41B5-990D-99FB2A38889A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{E3992B0B-4880-40BA-82BE-9F1001B90C6C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -169,6 +187,26 @@ Global
 		{1E3C8397-415C-46A7-B1BE-890F6FBEF34F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E3C8397-415C-46A7-B1BE-890F6FBEF34F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E3C8397-415C-46A7-B1BE-890F6FBEF34F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2C1D03D-DA79-4F28-9FF5-C8A5A94332B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2C1D03D-DA79-4F28-9FF5-C8A5A94332B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2C1D03D-DA79-4F28-9FF5-C8A5A94332B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2C1D03D-DA79-4F28-9FF5-C8A5A94332B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FC31AED-6A64-4CA0-B629-49FBA725843D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FC31AED-6A64-4CA0-B629-49FBA725843D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FC31AED-6A64-4CA0-B629-49FBA725843D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FC31AED-6A64-4CA0-B629-49FBA725843D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1059C4DF-3F31-4105-B5D9-F61881B56E42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1059C4DF-3F31-4105-B5D9-F61881B56E42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1059C4DF-3F31-4105-B5D9-F61881B56E42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1059C4DF-3F31-4105-B5D9-F61881B56E42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2AA6EEF3-1F26-4878-A4BD-B1F0C8CEACED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2AA6EEF3-1F26-4878-A4BD-B1F0C8CEACED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2AA6EEF3-1F26-4878-A4BD-B1F0C8CEACED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2AA6EEF3-1F26-4878-A4BD-B1F0C8CEACED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C02DBDB3-ED7C-4B26-B5A9-4D4C0985F722}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C02DBDB3-ED7C-4B26-B5A9-4D4C0985F722}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C02DBDB3-ED7C-4B26-B5A9-4D4C0985F722}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C02DBDB3-ED7C-4B26-B5A9-4D4C0985F722}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -200,6 +238,14 @@ Global
 		{18F1E6CD-3568-4042-9EC3-6430FD60EC3A} = {ECCD7E4F-3B41-4CEA-AF93-152825598039}
 		{992323BD-CC20-4630-AFD2-1483726305B8} = {EBEFBFED-2B7D-4133-8D79-0F61D6E8A085}
 		{B1389C0F-EAEB-4E1A-AA8F-8A3CED861A2D} = {EBEFBFED-2B7D-4133-8D79-0F61D6E8A085}
+		{E2C1D03D-DA79-4F28-9FF5-C8A5A94332B9} = {8AA84E5D-09EF-4E56-ACFD-6150B5B59EE6}
+		{5FC31AED-6A64-4CA0-B629-49FBA725843D} = {8AA84E5D-09EF-4E56-ACFD-6150B5B59EE6}
+		{8AA84E5D-09EF-4E56-ACFD-6150B5B59EE6} = {E3992B0B-4880-40BA-82BE-9F1001B90C6C}
+		{1059C4DF-3F31-4105-B5D9-F61881B56E42} = {295A4D3E-99F5-428C-BFD4-953406F8E964}
+		{2AA6EEF3-1F26-4878-A4BD-B1F0C8CEACED} = {295A4D3E-99F5-428C-BFD4-953406F8E964}
+		{295A4D3E-99F5-428C-BFD4-953406F8E964} = {E3992B0B-4880-40BA-82BE-9F1001B90C6C}
+		{C02DBDB3-ED7C-4B26-B5A9-4D4C0985F722} = {C8FC1413-126F-41B5-990D-99FB2A38889A}
+		{C8FC1413-126F-41B5-990D-99FB2A38889A} = {E3992B0B-4880-40BA-82BE-9F1001B90C6C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {22B7F474-635F-4C3B-A730-3BBE6C176F12}
diff --git a/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln b/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
index cc33ea615801c..9d5e3fc2a18cc 100644
--- a/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
+++ b/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
@@ -25,6 +25,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{A7FD80C3-CF4A-4FD5-B649-0056EC7E019C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{F7CAF25F-94A6-47B9-8602-0B6DD26A29B6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{4CD3B31F-ED1C-4F7E-B75D-79E83185BC33}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{7DF94D99-81A1-42C4-AAD0-29C1225218C1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{6235FA90-822A-41CB-97A7-753BA164DD68}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{38EF142E-0CD7-47F8-99EA-82AE39D1F444}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CFCD94CF-6369-4A15-A5BA-F93168B17E84}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{28B0EDC8-886B-4811-BC62-6FEC32A9E80A}"
@@ -33,6 +43,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0F494C94-E4F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{7A189071-7ABF-4420-B91C-8ED1DF536EA3}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{A9F23EA5-5E5B-4887-B2F2-CDFCC7A7CE80}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{511DEF04-08B5-47EA-8448-3A5A5EB792BB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{93075779-C861-454A-8BF7-8348CC195AB9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{71E6F8E4-53C1-4796-B779-FF1DC8BD96E8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,6 +109,26 @@ Global
 		{A7FD80C3-CF4A-4FD5-B649-0056EC7E019C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A7FD80C3-CF4A-4FD5-B649-0056EC7E019C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A7FD80C3-CF4A-4FD5-B649-0056EC7E019C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7CAF25F-94A6-47B9-8602-0B6DD26A29B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7CAF25F-94A6-47B9-8602-0B6DD26A29B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7CAF25F-94A6-47B9-8602-0B6DD26A29B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7CAF25F-94A6-47B9-8602-0B6DD26A29B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CD3B31F-ED1C-4F7E-B75D-79E83185BC33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CD3B31F-ED1C-4F7E-B75D-79E83185BC33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CD3B31F-ED1C-4F7E-B75D-79E83185BC33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CD3B31F-ED1C-4F7E-B75D-79E83185BC33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7DF94D99-81A1-42C4-AAD0-29C1225218C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DF94D99-81A1-42C4-AAD0-29C1225218C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DF94D99-81A1-42C4-AAD0-29C1225218C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DF94D99-81A1-42C4-AAD0-29C1225218C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6235FA90-822A-41CB-97A7-753BA164DD68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6235FA90-822A-41CB-97A7-753BA164DD68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6235FA90-822A-41CB-97A7-753BA164DD68}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6235FA90-822A-41CB-97A7-753BA164DD68}.Release|Any CPU.Build.0 = Release|Any CPU
+		{38EF142E-0CD7-47F8-99EA-82AE39D1F444}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38EF142E-0CD7-47F8-99EA-82AE39D1F444}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38EF142E-0CD7-47F8-99EA-82AE39D1F444}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{38EF142E-0CD7-47F8-99EA-82AE39D1F444}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -109,6 +147,14 @@ Global
 		{0C54036A-68E7-4D87-AE77-72279D8DC116} = {0F494C94-E4F3-4171-B171-BBB07EF645BE}
 		{A17EB996-964B-4D9F-9859-3DECA2EB9169} = {7A189071-7ABF-4420-B91C-8ED1DF536EA3}
 		{7987D82C-3F1E-4B4B-B405-08AFD062C7EE} = {7A189071-7ABF-4420-B91C-8ED1DF536EA3}
+		{F7CAF25F-94A6-47B9-8602-0B6DD26A29B6} = {A9F23EA5-5E5B-4887-B2F2-CDFCC7A7CE80}
+		{4CD3B31F-ED1C-4F7E-B75D-79E83185BC33} = {A9F23EA5-5E5B-4887-B2F2-CDFCC7A7CE80}
+		{A9F23EA5-5E5B-4887-B2F2-CDFCC7A7CE80} = {71E6F8E4-53C1-4796-B779-FF1DC8BD96E8}
+		{7DF94D99-81A1-42C4-AAD0-29C1225218C1} = {511DEF04-08B5-47EA-8448-3A5A5EB792BB}
+		{6235FA90-822A-41CB-97A7-753BA164DD68} = {511DEF04-08B5-47EA-8448-3A5A5EB792BB}
+		{511DEF04-08B5-47EA-8448-3A5A5EB792BB} = {71E6F8E4-53C1-4796-B779-FF1DC8BD96E8}
+		{38EF142E-0CD7-47F8-99EA-82AE39D1F444} = {93075779-C861-454A-8BF7-8348CC195AB9}
+		{93075779-C861-454A-8BF7-8348CC195AB9} = {71E6F8E4-53C1-4796-B779-FF1DC8BD96E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EFEE317E-9BE9-4733-A847-E0DBA00099CF}
diff --git a/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln b/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln
index 859fff2fb26e6..ac6eb452714e6 100644
--- a/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln
+++ b/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln
@@ -27,6 +27,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions", "..\System.Text.RegularExpressions\ref\System.Text.RegularExpressions.csproj", "{F372B1EA-6CB0-47A2-9178-657AF81238BC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{9F4F8154-997B-4FEA-887D-BCB76253FDBC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{8D49F54F-B39E-4AEB-BC3F-CEA035241259}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{98B45555-F4C0-418A-918C-0D9AAE90A9F5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{148F7F03-D51C-4F1B-8041-3313D3FD79E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{52338924-D31C-41F1-8DFE-F0B58802F974}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{76353E1C-A06B-4730-99EB-1C231937FF7B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5A286671-85EC-4D44-9777-9ED685F78B6C}"
@@ -35,6 +45,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B5211952-F90
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5EE792D4-BBEA-43B7-B822-ED01F9F39343}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{76832F3D-F8F9-4A19-85BE-489D9E1C6362}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{93F1A5F8-AB02-4D95-AF53-4C48AEBBE576}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{BF44A88D-24E2-4464-BAE4-5971B8A970A3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2B4EDC86-9128-48DC-B815-2D19C2371664}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +115,26 @@ Global
 		{F372B1EA-6CB0-47A2-9178-657AF81238BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F372B1EA-6CB0-47A2-9178-657AF81238BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F372B1EA-6CB0-47A2-9178-657AF81238BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F4F8154-997B-4FEA-887D-BCB76253FDBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F4F8154-997B-4FEA-887D-BCB76253FDBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F4F8154-997B-4FEA-887D-BCB76253FDBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F4F8154-997B-4FEA-887D-BCB76253FDBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D49F54F-B39E-4AEB-BC3F-CEA035241259}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D49F54F-B39E-4AEB-BC3F-CEA035241259}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D49F54F-B39E-4AEB-BC3F-CEA035241259}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D49F54F-B39E-4AEB-BC3F-CEA035241259}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98B45555-F4C0-418A-918C-0D9AAE90A9F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98B45555-F4C0-418A-918C-0D9AAE90A9F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98B45555-F4C0-418A-918C-0D9AAE90A9F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98B45555-F4C0-418A-918C-0D9AAE90A9F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{148F7F03-D51C-4F1B-8041-3313D3FD79E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{148F7F03-D51C-4F1B-8041-3313D3FD79E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{148F7F03-D51C-4F1B-8041-3313D3FD79E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{148F7F03-D51C-4F1B-8041-3313D3FD79E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52338924-D31C-41F1-8DFE-F0B58802F974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52338924-D31C-41F1-8DFE-F0B58802F974}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52338924-D31C-41F1-8DFE-F0B58802F974}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52338924-D31C-41F1-8DFE-F0B58802F974}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -116,6 +154,14 @@ Global
 		{C841B625-5802-40BE-850C-FA935E3D6E9A} = {B5211952-F905-4BE8-A3CF-25F393F5E506}
 		{2331FB61-25D7-4954-8289-D0CD834FBF4E} = {5EE792D4-BBEA-43B7-B822-ED01F9F39343}
 		{5B219FB9-034D-4A72-976D-B9ED8412DAD3} = {5EE792D4-BBEA-43B7-B822-ED01F9F39343}
+		{9F4F8154-997B-4FEA-887D-BCB76253FDBC} = {76832F3D-F8F9-4A19-85BE-489D9E1C6362}
+		{8D49F54F-B39E-4AEB-BC3F-CEA035241259} = {76832F3D-F8F9-4A19-85BE-489D9E1C6362}
+		{76832F3D-F8F9-4A19-85BE-489D9E1C6362} = {2B4EDC86-9128-48DC-B815-2D19C2371664}
+		{98B45555-F4C0-418A-918C-0D9AAE90A9F5} = {93F1A5F8-AB02-4D95-AF53-4C48AEBBE576}
+		{148F7F03-D51C-4F1B-8041-3313D3FD79E8} = {93F1A5F8-AB02-4D95-AF53-4C48AEBBE576}
+		{93F1A5F8-AB02-4D95-AF53-4C48AEBBE576} = {2B4EDC86-9128-48DC-B815-2D19C2371664}
+		{52338924-D31C-41F1-8DFE-F0B58802F974} = {BF44A88D-24E2-4464-BAE4-5971B8A970A3}
+		{BF44A88D-24E2-4464-BAE4-5971B8A970A3} = {2B4EDC86-9128-48DC-B815-2D19C2371664}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {91AA499B-9713-4B53-A6A7-7035C7C72935}
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 33ba4eb6dff46..4ca27c4eb945b 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
@@ -41,6 +41,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ObjectModel", "..\Sy
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JSImportGenerator", "..\System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj", "{5C036B23-44E0-4F0D-9CE3-DE29E66DFE7E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.JavaScript", "..\System.Runtime.InteropServices.JavaScript\ref\System.Runtime.InteropServices.JavaScript.csproj", "{4C06C0C8-67D8-4329-B083-6906261C8838}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.JavaScript", "..\System.Runtime.InteropServices.JavaScript\src\System.Runtime.InteropServices.JavaScript.csproj", "{61BC8746-42CB-452E-AF4B-A2555C1DAB2F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{CC7A6F9E-B369-4BDE-9903-9F4ACCC7A24A}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{7A0C1B6C-0439-4A1F-95CC-67F04A9657FE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{6659E37B-9C84-4815-9CAB-19F367D3D66D}"
@@ -53,6 +59,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography", "..\System.Security.Cryptography\ref\System.Security.Cryptography.csproj", "{620776C7-6DE5-4398-8C93-D30FF68C3C11}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{619B12CC-42E2-472F-9934-BBCEE34BDAD2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{E579B589-D9C9-4A77-BC2C-A8EAD293A603}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{C0C9A9C0-51E4-4627-9221-E9411E2C0FAC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{DFB3F30A-21B6-481A-BE52-E7FABDB75794}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{D55C29A5-A426-4D63-B188-670E30BDA3AE}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BEE2F256-0489-4809-AB20-27ADB2D0E10C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A0314AC5-E490-4A6A-B946-8B9A21A2FA05}"
@@ -61,6 +77,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6F9A42A0-A04
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{58925E96-1A39-4E29-ACB4-4C4DAB81F60A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{78DF8970-30DA-4E8C-8ECE-15935940ACD8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{A9E19E1F-375B-4397-B9DB-AA2184FFC68A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{54D53A1C-59C6-47F1-AC04-0C8089382F23}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{F1FA4A87-2D90-497E-BAD7-B6D23FDEEBF8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -151,6 +175,18 @@ Global
 		{5C036B23-44E0-4F0D-9CE3-DE29E66DFE7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5C036B23-44E0-4F0D-9CE3-DE29E66DFE7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5C036B23-44E0-4F0D-9CE3-DE29E66DFE7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C06C0C8-67D8-4329-B083-6906261C8838}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C06C0C8-67D8-4329-B083-6906261C8838}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C06C0C8-67D8-4329-B083-6906261C8838}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C06C0C8-67D8-4329-B083-6906261C8838}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61BC8746-42CB-452E-AF4B-A2555C1DAB2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61BC8746-42CB-452E-AF4B-A2555C1DAB2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61BC8746-42CB-452E-AF4B-A2555C1DAB2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61BC8746-42CB-452E-AF4B-A2555C1DAB2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC7A6F9E-B369-4BDE-9903-9F4ACCC7A24A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC7A6F9E-B369-4BDE-9903-9F4ACCC7A24A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC7A6F9E-B369-4BDE-9903-9F4ACCC7A24A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC7A6F9E-B369-4BDE-9903-9F4ACCC7A24A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7A0C1B6C-0439-4A1F-95CC-67F04A9657FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7A0C1B6C-0439-4A1F-95CC-67F04A9657FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7A0C1B6C-0439-4A1F-95CC-67F04A9657FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -175,6 +211,26 @@ Global
 		{620776C7-6DE5-4398-8C93-D30FF68C3C11}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{620776C7-6DE5-4398-8C93-D30FF68C3C11}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{620776C7-6DE5-4398-8C93-D30FF68C3C11}.Release|Any CPU.Build.0 = Release|Any CPU
+		{619B12CC-42E2-472F-9934-BBCEE34BDAD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{619B12CC-42E2-472F-9934-BBCEE34BDAD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{619B12CC-42E2-472F-9934-BBCEE34BDAD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{619B12CC-42E2-472F-9934-BBCEE34BDAD2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E579B589-D9C9-4A77-BC2C-A8EAD293A603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E579B589-D9C9-4A77-BC2C-A8EAD293A603}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E579B589-D9C9-4A77-BC2C-A8EAD293A603}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E579B589-D9C9-4A77-BC2C-A8EAD293A603}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0C9A9C0-51E4-4627-9221-E9411E2C0FAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0C9A9C0-51E4-4627-9221-E9411E2C0FAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0C9A9C0-51E4-4627-9221-E9411E2C0FAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0C9A9C0-51E4-4627-9221-E9411E2C0FAC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DFB3F30A-21B6-481A-BE52-E7FABDB75794}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFB3F30A-21B6-481A-BE52-E7FABDB75794}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFB3F30A-21B6-481A-BE52-E7FABDB75794}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DFB3F30A-21B6-481A-BE52-E7FABDB75794}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D55C29A5-A426-4D63-B188-670E30BDA3AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D55C29A5-A426-4D63-B188-670E30BDA3AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D55C29A5-A426-4D63-B188-670E30BDA3AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D55C29A5-A426-4D63-B188-670E30BDA3AE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -199,14 +255,25 @@ Global
 		{BEA5BC2C-12D1-4D01-8D2C-5029578BD066} = {A0314AC5-E490-4A6A-B946-8B9A21A2FA05}
 		{96065341-8032-40B4-A1B5-C9DC83DFEF4E} = {A0314AC5-E490-4A6A-B946-8B9A21A2FA05}
 		{CF0716D1-9916-4A97-939C-2FE477193A8F} = {A0314AC5-E490-4A6A-B946-8B9A21A2FA05}
+		{4C06C0C8-67D8-4329-B083-6906261C8838} = {A0314AC5-E490-4A6A-B946-8B9A21A2FA05}
 		{2BD4ACB1-47A4-4AA5-9624-6DC939B4EB12} = {A0314AC5-E490-4A6A-B946-8B9A21A2FA05}
 		{A4995F4A-D42F-47AD-BFF1-A46BC1B4574E} = {A0314AC5-E490-4A6A-B946-8B9A21A2FA05}
 		{49C959C3-D2C1-4A66-B29E-FE8E393BC274} = {A0314AC5-E490-4A6A-B946-8B9A21A2FA05}
 		{620776C7-6DE5-4398-8C93-D30FF68C3C11} = {A0314AC5-E490-4A6A-B946-8B9A21A2FA05}
 		{0CD4C24D-7746-46F0-8D47-A396882B5468} = {6F9A42A0-A04B-4CD0-B8C9-9A728274C851}
+		{61BC8746-42CB-452E-AF4B-A2555C1DAB2F} = {6F9A42A0-A04B-4CD0-B8C9-9A728274C851}
 		{5C036B23-44E0-4F0D-9CE3-DE29E66DFE7E} = {58925E96-1A39-4E29-ACB4-4C4DAB81F60A}
+		{CC7A6F9E-B369-4BDE-9903-9F4ACCC7A24A} = {58925E96-1A39-4E29-ACB4-4C4DAB81F60A}
 		{7A0C1B6C-0439-4A1F-95CC-67F04A9657FE} = {58925E96-1A39-4E29-ACB4-4C4DAB81F60A}
 		{6659E37B-9C84-4815-9CAB-19F367D3D66D} = {58925E96-1A39-4E29-ACB4-4C4DAB81F60A}
+		{619B12CC-42E2-472F-9934-BBCEE34BDAD2} = {78DF8970-30DA-4E8C-8ECE-15935940ACD8}
+		{E579B589-D9C9-4A77-BC2C-A8EAD293A603} = {78DF8970-30DA-4E8C-8ECE-15935940ACD8}
+		{78DF8970-30DA-4E8C-8ECE-15935940ACD8} = {F1FA4A87-2D90-497E-BAD7-B6D23FDEEBF8}
+		{C0C9A9C0-51E4-4627-9221-E9411E2C0FAC} = {A9E19E1F-375B-4397-B9DB-AA2184FFC68A}
+		{DFB3F30A-21B6-481A-BE52-E7FABDB75794} = {A9E19E1F-375B-4397-B9DB-AA2184FFC68A}
+		{A9E19E1F-375B-4397-B9DB-AA2184FFC68A} = {F1FA4A87-2D90-497E-BAD7-B6D23FDEEBF8}
+		{D55C29A5-A426-4D63-B188-670E30BDA3AE} = {54D53A1C-59C6-47F1-AC04-0C8089382F23}
+		{54D53A1C-59C6-47F1-AC04-0C8089382F23} = {F1FA4A87-2D90-497E-BAD7-B6D23FDEEBF8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D91D7DC5-24CC-4716-A357-8170C4EB1C32}
diff --git a/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln b/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln
index df1dd89d11871..0c22fe29c741b 100644
--- a/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln
+++ b/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln
@@ -33,6 +33,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{9F9335A3-0158-4A00-8CB0-F8E9CAC21AA1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{9674A6B1-2CE4-49BC-BE80-E99944AA2065}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{C9958509-D98E-4A4C-A68F-AD245A2FACAF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{A692165F-A17C-4A85-B0B5-A7599867FB0A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{19FBAD24-736F-409D-AB9F-A52902F25C1E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{0904A438-3AC8-4936-9482-541131F95BCE}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9099A547-2E14-439D-8A52-0AB72FF53DBB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B31191C3-543F-486D-8273-506BD0717B38}"
@@ -41,6 +51,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4518E3A1-BCE
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CA82EA7A-B4F6-4A96-A7B1-A6646E51586E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{4218D708-7D8F-40D1-AF86-9AC654EFF211}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{5B3AFD17-94E9-46FE-9E98-93ABEED7F5E0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{139955F9-F83E-4AA9-84CA-DCA7730CD819}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{AAF302C0-3D3F-4428-9351-62CB2A2EE691}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -115,6 +133,26 @@ Global
 		{9F9335A3-0158-4A00-8CB0-F8E9CAC21AA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9F9335A3-0158-4A00-8CB0-F8E9CAC21AA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9F9335A3-0158-4A00-8CB0-F8E9CAC21AA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9674A6B1-2CE4-49BC-BE80-E99944AA2065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9674A6B1-2CE4-49BC-BE80-E99944AA2065}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9674A6B1-2CE4-49BC-BE80-E99944AA2065}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9674A6B1-2CE4-49BC-BE80-E99944AA2065}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9958509-D98E-4A4C-A68F-AD245A2FACAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9958509-D98E-4A4C-A68F-AD245A2FACAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9958509-D98E-4A4C-A68F-AD245A2FACAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9958509-D98E-4A4C-A68F-AD245A2FACAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A692165F-A17C-4A85-B0B5-A7599867FB0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A692165F-A17C-4A85-B0B5-A7599867FB0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A692165F-A17C-4A85-B0B5-A7599867FB0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A692165F-A17C-4A85-B0B5-A7599867FB0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FBAD24-736F-409D-AB9F-A52902F25C1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FBAD24-736F-409D-AB9F-A52902F25C1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FBAD24-736F-409D-AB9F-A52902F25C1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FBAD24-736F-409D-AB9F-A52902F25C1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0904A438-3AC8-4936-9482-541131F95BCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0904A438-3AC8-4936-9482-541131F95BCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0904A438-3AC8-4936-9482-541131F95BCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0904A438-3AC8-4936-9482-541131F95BCE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -137,6 +175,14 @@ Global
 		{F98FE3DF-F166-41AA-826D-72318ECC3427} = {CA82EA7A-B4F6-4A96-A7B1-A6646E51586E}
 		{B59FA95B-262E-4580-AB36-37DB5E16917A} = {CA82EA7A-B4F6-4A96-A7B1-A6646E51586E}
 		{41157B1B-46DE-4775-8490-2FF9D9E8E4CA} = {CA82EA7A-B4F6-4A96-A7B1-A6646E51586E}
+		{9674A6B1-2CE4-49BC-BE80-E99944AA2065} = {4218D708-7D8F-40D1-AF86-9AC654EFF211}
+		{C9958509-D98E-4A4C-A68F-AD245A2FACAF} = {4218D708-7D8F-40D1-AF86-9AC654EFF211}
+		{4218D708-7D8F-40D1-AF86-9AC654EFF211} = {AAF302C0-3D3F-4428-9351-62CB2A2EE691}
+		{A692165F-A17C-4A85-B0B5-A7599867FB0A} = {5B3AFD17-94E9-46FE-9E98-93ABEED7F5E0}
+		{19FBAD24-736F-409D-AB9F-A52902F25C1E} = {5B3AFD17-94E9-46FE-9E98-93ABEED7F5E0}
+		{5B3AFD17-94E9-46FE-9E98-93ABEED7F5E0} = {AAF302C0-3D3F-4428-9351-62CB2A2EE691}
+		{0904A438-3AC8-4936-9482-541131F95BCE} = {139955F9-F83E-4AA9-84CA-DCA7730CD819}
+		{139955F9-F83E-4AA9-84CA-DCA7730CD819} = {AAF302C0-3D3F-4428-9351-62CB2A2EE691}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {78E8A71E-2CB4-4C05-8DBB-C926F44A9393}
diff --git a/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln b/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln
index cc3000d60ef88..5a1bf792736d9 100644
--- a/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln
+++ b/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln
@@ -1,18 +1,30 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9F20CEA1-2216-4432-BBBD-F01E05D17F23}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Numerics", "..\Microsoft.Bcl.Numerics\ref\Microsoft.Bcl.Numerics.csproj", "{D311ABE4-10A9-4BB1-89CE-6358C55501A8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Numerics", "..\Microsoft.Bcl.Numerics\src\Microsoft.Bcl.Numerics.csproj", "{1578185F-C4FA-4866-936B-E62AAEDD03B7}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Tensors", "ref\System.Numerics.Tensors.csproj", "{21CB448A-3882-4337-B416-D1A3E0BCFFC5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Tensors", "src\System.Numerics.Tensors.csproj", "{848DD000-3D22-4A25-A9D9-05AFF857A116}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Tensors.Tests", "tests\System.Numerics.Tensors.Tests.csproj", "{4AF6A02D-82C8-4898-9EDF-01F107C25061}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{8CA7C982-3EE4-4BCE-9493-7A63556736D3}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4588351F-4233-4957-B84C-7F8E22B8888A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{DB954E01-898A-4FE2-A3AA-180D041AB08F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{04FC0651-B9D0-448A-A28B-11B1D4A897F4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{683A7D28-CC55-4375-848D-E659075ECEE4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{1CBEAEA8-2CA1-4B07-9930-35A785205852}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{BA7828B1-7953-47A0-AE5A-E22B501C4BD0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{57E57290-3A6A-43F8-8764-D4DC8151F89C}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DE94CA7D-BB10-4865-85A6-6B694631247F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6BC42E6D-848C-4533-B715-F116E7DB3610}"
@@ -21,6 +33,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AB415F5A-75E
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{083161E5-6049-4D84-9739-9D7797D7117D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{841A2FA4-A95F-4612-A8B9-AD2EF769BC71}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{DF0561A1-3AB8-4B51-AFB4-392EE1DD6247}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{7AC4B2C7-A55C-4C4F-9B02-77F5CBFFF4AB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{F9C2AAB1-C7B0-4E43-BB18-4FB16F6E272B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,6 +51,14 @@ Global
 		{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
+		{D311ABE4-10A9-4BB1-89CE-6358C55501A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D311ABE4-10A9-4BB1-89CE-6358C55501A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D311ABE4-10A9-4BB1-89CE-6358C55501A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D311ABE4-10A9-4BB1-89CE-6358C55501A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1578185F-C4FA-4866-936B-E62AAEDD03B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1578185F-C4FA-4866-936B-E62AAEDD03B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1578185F-C4FA-4866-936B-E62AAEDD03B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1578185F-C4FA-4866-936B-E62AAEDD03B7}.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
@@ -43,10 +71,6 @@ Global
 		{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
-		{8CA7C982-3EE4-4BCE-9493-7A63556736D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CA7C982-3EE4-4BCE-9493-7A63556736D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CA7C982-3EE4-4BCE-9493-7A63556736D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8CA7C982-3EE4-4BCE-9493-7A63556736D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4588351F-4233-4957-B84C-7F8E22B8888A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4588351F-4233-4957-B84C-7F8E22B8888A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4588351F-4233-4957-B84C-7F8E22B8888A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +79,26 @@ Global
 		{DB954E01-898A-4FE2-A3AA-180D041AB08F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DB954E01-898A-4FE2-A3AA-180D041AB08F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB954E01-898A-4FE2-A3AA-180D041AB08F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04FC0651-B9D0-448A-A28B-11B1D4A897F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04FC0651-B9D0-448A-A28B-11B1D4A897F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04FC0651-B9D0-448A-A28B-11B1D4A897F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04FC0651-B9D0-448A-A28B-11B1D4A897F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{683A7D28-CC55-4375-848D-E659075ECEE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{683A7D28-CC55-4375-848D-E659075ECEE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{683A7D28-CC55-4375-848D-E659075ECEE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{683A7D28-CC55-4375-848D-E659075ECEE4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1CBEAEA8-2CA1-4B07-9930-35A785205852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CBEAEA8-2CA1-4B07-9930-35A785205852}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CBEAEA8-2CA1-4B07-9930-35A785205852}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1CBEAEA8-2CA1-4B07-9930-35A785205852}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA7828B1-7953-47A0-AE5A-E22B501C4BD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA7828B1-7953-47A0-AE5A-E22B501C4BD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA7828B1-7953-47A0-AE5A-E22B501C4BD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA7828B1-7953-47A0-AE5A-E22B501C4BD0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57E57290-3A6A-43F8-8764-D4DC8151F89C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57E57290-3A6A-43F8-8764-D4DC8151F89C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57E57290-3A6A-43F8-8764-D4DC8151F89C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57E57290-3A6A-43F8-8764-D4DC8151F89C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -62,11 +106,20 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{9F20CEA1-2216-4432-BBBD-F01E05D17F23} = {DE94CA7D-BB10-4865-85A6-6B694631247F}
 		{4AF6A02D-82C8-4898-9EDF-01F107C25061} = {DE94CA7D-BB10-4865-85A6-6B694631247F}
+		{D311ABE4-10A9-4BB1-89CE-6358C55501A8} = {6BC42E6D-848C-4533-B715-F116E7DB3610}
 		{21CB448A-3882-4337-B416-D1A3E0BCFFC5} = {6BC42E6D-848C-4533-B715-F116E7DB3610}
+		{1578185F-C4FA-4866-936B-E62AAEDD03B7} = {AB415F5A-75E5-4E03-8A92-15CEDEC4CD3A}
 		{848DD000-3D22-4A25-A9D9-05AFF857A116} = {AB415F5A-75E5-4E03-8A92-15CEDEC4CD3A}
-		{8CA7C982-3EE4-4BCE-9493-7A63556736D3} = {083161E5-6049-4D84-9739-9D7797D7117D}
 		{4588351F-4233-4957-B84C-7F8E22B8888A} = {083161E5-6049-4D84-9739-9D7797D7117D}
 		{DB954E01-898A-4FE2-A3AA-180D041AB08F} = {083161E5-6049-4D84-9739-9D7797D7117D}
+		{04FC0651-B9D0-448A-A28B-11B1D4A897F4} = {841A2FA4-A95F-4612-A8B9-AD2EF769BC71}
+		{683A7D28-CC55-4375-848D-E659075ECEE4} = {841A2FA4-A95F-4612-A8B9-AD2EF769BC71}
+		{841A2FA4-A95F-4612-A8B9-AD2EF769BC71} = {F9C2AAB1-C7B0-4E43-BB18-4FB16F6E272B}
+		{1CBEAEA8-2CA1-4B07-9930-35A785205852} = {DF0561A1-3AB8-4B51-AFB4-392EE1DD6247}
+		{BA7828B1-7953-47A0-AE5A-E22B501C4BD0} = {DF0561A1-3AB8-4B51-AFB4-392EE1DD6247}
+		{DF0561A1-3AB8-4B51-AFB4-392EE1DD6247} = {F9C2AAB1-C7B0-4E43-BB18-4FB16F6E272B}
+		{57E57290-3A6A-43F8-8764-D4DC8151F89C} = {7AC4B2C7-A55C-4C4F-9B02-77F5CBFFF4AB}
+		{7AC4B2C7-A55C-4C4F-9B02-77F5CBFFF4AB} = {F9C2AAB1-C7B0-4E43-BB18-4FB16F6E272B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {10A5F2C3-5230-4916-9D4D-BBDB94851037}
diff --git a/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln b/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln
index 57db262068d54..148f7e813c4c1 100644
--- a/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln
+++ b/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln
@@ -19,14 +19,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{728E34E5-10B0-4181-940B-EB3FB7784DFA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FC10C682-DF71-4EEA-A3A5-E716C1C88AC0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{49B6B26B-CEC6-4EE8-8177-47891A85518A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{69A926A1-F426-4501-8641-84B10BF0C698}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{E3DB94BA-35EE-4D66-9958-B22D73A43943}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{C3847F2F-603E-467F-99C3-A4B619E25544}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2C4425BA-8478-4BCB-B616-E6FC28ADEAB9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ED90FF1C-59D4-4AB0-860E-2872ECA1BFEC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FC10C682-DF71-4EEA-A3A5-E716C1C88AC0}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{38837FDE-8CFE-4676-B3CE-48165E0FD6CF}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{06497322-6B9A-48E6-BEA8-C96362AD7180}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{E40BE5C0-684A-424B-B41A-2E9FDA893718}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{0F563BE9-8226-4DB5-A42D-3AB163BDF92D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{8E7812D8-8284-4449-92BE-3216F9E141B5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -265,21 +285,134 @@ Global
 		{728E34E5-10B0-4181-940B-EB3FB7784DFA}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{728E34E5-10B0-4181-940B-EB3FB7784DFA}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{728E34E5-10B0-4181-940B-EB3FB7784DFA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Debug|x64.Build.0 = Debug|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Debug|x86.Build.0 = Debug|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Release|arm.ActiveCfg = Release|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Release|x64.ActiveCfg = Release|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Release|x64.Build.0 = Release|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Release|x86.ActiveCfg = Release|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Release|x86.Build.0 = Release|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Debug|x64.Build.0 = Debug|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Debug|x86.Build.0 = Debug|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Release|arm.ActiveCfg = Release|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Release|arm64.ActiveCfg = Release|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Release|x64.ActiveCfg = Release|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Release|x64.Build.0 = Release|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Release|x86.ActiveCfg = Release|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Release|x86.Build.0 = Release|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{69A926A1-F426-4501-8641-84B10BF0C698}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Debug|x64.Build.0 = Debug|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Debug|x86.Build.0 = Debug|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Release|arm.ActiveCfg = Release|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Release|x64.ActiveCfg = Release|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Release|x64.Build.0 = Release|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Release|x86.ActiveCfg = Release|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Release|x86.Build.0 = Release|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Debug|x64.Build.0 = Debug|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Debug|x86.Build.0 = Debug|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Release|Any CPU.Build.0 = Release|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Release|arm.ActiveCfg = Release|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Release|arm64.ActiveCfg = Release|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Release|x64.ActiveCfg = Release|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Release|x64.Build.0 = Release|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Release|x86.ActiveCfg = Release|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Release|x86.Build.0 = Release|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Debug|x64.Build.0 = Debug|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Debug|x86.Build.0 = Debug|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Release|arm.ActiveCfg = Release|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Release|x64.ActiveCfg = Release|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Release|x64.Build.0 = Release|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Release|x86.ActiveCfg = Release|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Release|x86.Build.0 = Release|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{634A3B2B-09F5-4810-B630-ADE4D36C47DF} = {FC10C682-DF71-4EEA-A3A5-E716C1C88AC0}
-		{ED450846-85A0-4CED-B4D9-9EB769CF794B} = {FC10C682-DF71-4EEA-A3A5-E716C1C88AC0}
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF} = {C3847F2F-603E-467F-99C3-A4B619E25544}
 		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F} = {2C4425BA-8478-4BCB-B616-E6FC28ADEAB9}
 		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B} = {2C4425BA-8478-4BCB-B616-E6FC28ADEAB9}
 		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7} = {ED90FF1C-59D4-4AB0-860E-2872ECA1BFEC}
 		{1542B12A-6A37-49F9-B87B-4B1BB1F689E4} = {ED90FF1C-59D4-4AB0-860E-2872ECA1BFEC}
 		{728E34E5-10B0-4181-940B-EB3FB7784DFA} = {ED90FF1C-59D4-4AB0-860E-2872ECA1BFEC}
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B} = {FC10C682-DF71-4EEA-A3A5-E716C1C88AC0}
 		{88F4A78E-4EF9-4EB6-995E-CD24152C4704} = {38837FDE-8CFE-4676-B3CE-48165E0FD6CF}
 		{547EC332-29FE-47A8-B477-4E19BE521235} = {38837FDE-8CFE-4676-B3CE-48165E0FD6CF}
 		{F99EAF58-533E-4941-A0C5-5101309D8AB9} = {38837FDE-8CFE-4676-B3CE-48165E0FD6CF}
+		{49B6B26B-CEC6-4EE8-8177-47891A85518A} = {06497322-6B9A-48E6-BEA8-C96362AD7180}
+		{69A926A1-F426-4501-8641-84B10BF0C698} = {06497322-6B9A-48E6-BEA8-C96362AD7180}
+		{06497322-6B9A-48E6-BEA8-C96362AD7180} = {8E7812D8-8284-4449-92BE-3216F9E141B5}
+		{E3DB94BA-35EE-4D66-9958-B22D73A43943} = {E40BE5C0-684A-424B-B41A-2E9FDA893718}
+		{128E84CD-654A-44E5-B4D7-7F5D7A9E6341} = {E40BE5C0-684A-424B-B41A-2E9FDA893718}
+		{E40BE5C0-684A-424B-B41A-2E9FDA893718} = {8E7812D8-8284-4449-92BE-3216F9E141B5}
+		{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A} = {0F563BE9-8226-4DB5-A42D-3AB163BDF92D}
+		{0F563BE9-8226-4DB5-A42D-3AB163BDF92D} = {8E7812D8-8284-4449-92BE-3216F9E141B5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F9EDC1DC-52BE-4C40-90D2-41EE6FB7FA5C}
diff --git a/src/libraries/System.ObjectModel/System.ObjectModel.sln b/src/libraries/System.ObjectModel/System.ObjectModel.sln
index b489d33fdf20b..1576c836f68f0 100644
--- a/src/libraries/System.ObjectModel/System.ObjectModel.sln
+++ b/src/libraries/System.ObjectModel/System.ObjectModel.sln
@@ -15,6 +15,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{5BC772EA-32FF-4918-844E-CC61F30042EE}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{D4EF791E-CB42-486C-846B-8943EF22F2B4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{70E2D108-F236-4419-AE0F-DAFF44CB455A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{A6345F71-0CB3-4F98-828D-A72644450B4D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{849BB255-5177-4A79-AF68-61F7345F027D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A313EDEE-2921-49B0-81F2-A02949F9DF68}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7D905913-8F74-4711-80B7-CFAD20A5B57B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E5C2B29-721D-4DDF-985F-81CA593E4F42}"
@@ -23,6 +33,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{35DDEBAA-829
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0534B176-48FC-4F4D-9D44-ADD06237B038}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{8279B20A-0105-4A9F-8CFE-02666847838C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{78287EF1-7997-4648-8685-670B4816FE87}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{1AD0830D-18A0-4DC3-A917-A816DFC3C6A0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{3517D2A8-B899-444A-B6B1-97E96E9527CE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,6 +79,26 @@ Global
 		{5BC772EA-32FF-4918-844E-CC61F30042EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5BC772EA-32FF-4918-844E-CC61F30042EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5BC772EA-32FF-4918-844E-CC61F30042EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4EF791E-CB42-486C-846B-8943EF22F2B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4EF791E-CB42-486C-846B-8943EF22F2B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4EF791E-CB42-486C-846B-8943EF22F2B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4EF791E-CB42-486C-846B-8943EF22F2B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70E2D108-F236-4419-AE0F-DAFF44CB455A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70E2D108-F236-4419-AE0F-DAFF44CB455A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70E2D108-F236-4419-AE0F-DAFF44CB455A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70E2D108-F236-4419-AE0F-DAFF44CB455A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6345F71-0CB3-4F98-828D-A72644450B4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6345F71-0CB3-4F98-828D-A72644450B4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6345F71-0CB3-4F98-828D-A72644450B4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6345F71-0CB3-4F98-828D-A72644450B4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{849BB255-5177-4A79-AF68-61F7345F027D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{849BB255-5177-4A79-AF68-61F7345F027D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{849BB255-5177-4A79-AF68-61F7345F027D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{849BB255-5177-4A79-AF68-61F7345F027D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A313EDEE-2921-49B0-81F2-A02949F9DF68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A313EDEE-2921-49B0-81F2-A02949F9DF68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A313EDEE-2921-49B0-81F2-A02949F9DF68}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A313EDEE-2921-49B0-81F2-A02949F9DF68}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -74,6 +112,14 @@ Global
 		{583024EB-8FC7-45E3-9C37-85BE43FBD28A} = {35DDEBAA-829C-43C1-BB49-29A11589D22D}
 		{A42FE6C9-59F1-43E7-AD34-802F13254284} = {0534B176-48FC-4F4D-9D44-ADD06237B038}
 		{A62E47A3-C3A7-421A-B3E6-2DD578A50781} = {0534B176-48FC-4F4D-9D44-ADD06237B038}
+		{D4EF791E-CB42-486C-846B-8943EF22F2B4} = {8279B20A-0105-4A9F-8CFE-02666847838C}
+		{70E2D108-F236-4419-AE0F-DAFF44CB455A} = {8279B20A-0105-4A9F-8CFE-02666847838C}
+		{8279B20A-0105-4A9F-8CFE-02666847838C} = {3517D2A8-B899-444A-B6B1-97E96E9527CE}
+		{A6345F71-0CB3-4F98-828D-A72644450B4D} = {78287EF1-7997-4648-8685-670B4816FE87}
+		{849BB255-5177-4A79-AF68-61F7345F027D} = {78287EF1-7997-4648-8685-670B4816FE87}
+		{78287EF1-7997-4648-8685-670B4816FE87} = {3517D2A8-B899-444A-B6B1-97E96E9527CE}
+		{A313EDEE-2921-49B0-81F2-A02949F9DF68} = {1AD0830D-18A0-4DC3-A917-A816DFC3C6A0}
+		{1AD0830D-18A0-4DC3-A917-A816DFC3C6A0} = {3517D2A8-B899-444A-B6B1-97E96E9527CE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {485C729C-EB7F-4DE2-AE84-428EB1D65902}
diff --git a/src/libraries/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln b/src/libraries/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln
index ff1ab62749177..939a32fa5b660 100644
--- a/src/libraries/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln
+++ b/src/libraries/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln
@@ -1,12 +1,34 @@
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{54116CEF-C987-4CE5-940B-613A016AD6CA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{801938D9-5DB8-4F15-B1C1-FB67723C75F9}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Generator", "..\System.Text.RegularExpressions\gen\System.Text.RegularExpressions.Generator.csproj", "{FB5A7543-CB37-40A0-807F-76879E1000F5}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{0F50BEBA-FC93-455A-9234-3E23503154BA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{0DBEA438-8690-40EC-AD89-2D919F3193C2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{42D51B58-DD11-4A48-85FE-F2968EAD189A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{C3EB6EB7-E76E-4501-A731-5716FBA4541B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{2D547189-B301-4BDC-8B82-88CE3B05E36E}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{14B38A7F-3A3B-4C41-AE5C-D8AA236626DD}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6EF339F7-5861-440F-88F7-333F04F0ABD7}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{C7637E36-CE91-4215-A0F4-78FD03DB7500}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{6196D76E-C5CF-42DB-BA57-619C57A8B88B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{757EB40A-927D-42C0-83E7-D21B7B242317}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{4F01BCF9-13F3-4D0B-9564-F29027799B71}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,17 +39,55 @@ Global
 		{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
+		{54116CEF-C987-4CE5-940B-613A016AD6CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54116CEF-C987-4CE5-940B-613A016AD6CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54116CEF-C987-4CE5-940B-613A016AD6CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54116CEF-C987-4CE5-940B-613A016AD6CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{801938D9-5DB8-4F15-B1C1-FB67723C75F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{801938D9-5DB8-4F15-B1C1-FB67723C75F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{801938D9-5DB8-4F15-B1C1-FB67723C75F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{801938D9-5DB8-4F15-B1C1-FB67723C75F9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FB5A7543-CB37-40A0-807F-76879E1000F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FB5A7543-CB37-40A0-807F-76879E1000F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FB5A7543-CB37-40A0-807F-76879E1000F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FB5A7543-CB37-40A0-807F-76879E1000F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F50BEBA-FC93-455A-9234-3E23503154BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F50BEBA-FC93-455A-9234-3E23503154BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F50BEBA-FC93-455A-9234-3E23503154BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F50BEBA-FC93-455A-9234-3E23503154BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DBEA438-8690-40EC-AD89-2D919F3193C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DBEA438-8690-40EC-AD89-2D919F3193C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DBEA438-8690-40EC-AD89-2D919F3193C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DBEA438-8690-40EC-AD89-2D919F3193C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42D51B58-DD11-4A48-85FE-F2968EAD189A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42D51B58-DD11-4A48-85FE-F2968EAD189A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42D51B58-DD11-4A48-85FE-F2968EAD189A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42D51B58-DD11-4A48-85FE-F2968EAD189A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3EB6EB7-E76E-4501-A731-5716FBA4541B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3EB6EB7-E76E-4501-A731-5716FBA4541B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3EB6EB7-E76E-4501-A731-5716FBA4541B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3EB6EB7-E76E-4501-A731-5716FBA4541B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D547189-B301-4BDC-8B82-88CE3B05E36E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D547189-B301-4BDC-8B82-88CE3B05E36E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D547189-B301-4BDC-8B82-88CE3B05E36E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D547189-B301-4BDC-8B82-88CE3B05E36E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{493BBB98-5E20-46BE-A7DC-1584F39DE27D} = {14B38A7F-3A3B-4C41-AE5C-D8AA236626DD}
+		{54116CEF-C987-4CE5-940B-613A016AD6CA} = {6EF339F7-5861-440F-88F7-333F04F0ABD7}
+		{801938D9-5DB8-4F15-B1C1-FB67723C75F9} = {6EF339F7-5861-440F-88F7-333F04F0ABD7}
 		{FB5A7543-CB37-40A0-807F-76879E1000F5} = {6EF339F7-5861-440F-88F7-333F04F0ABD7}
+		{0F50BEBA-FC93-455A-9234-3E23503154BA} = {C7637E36-CE91-4215-A0F4-78FD03DB7500}
+		{0DBEA438-8690-40EC-AD89-2D919F3193C2} = {C7637E36-CE91-4215-A0F4-78FD03DB7500}
+		{C7637E36-CE91-4215-A0F4-78FD03DB7500} = {4F01BCF9-13F3-4D0B-9564-F29027799B71}
+		{42D51B58-DD11-4A48-85FE-F2968EAD189A} = {6196D76E-C5CF-42DB-BA57-619C57A8B88B}
+		{C3EB6EB7-E76E-4501-A731-5716FBA4541B} = {6196D76E-C5CF-42DB-BA57-619C57A8B88B}
+		{6196D76E-C5CF-42DB-BA57-619C57A8B88B} = {4F01BCF9-13F3-4D0B-9564-F29027799B71}
+		{2D547189-B301-4BDC-8B82-88CE3B05E36E} = {757EB40A-927D-42C0-83E7-D21B7B242317}
+		{757EB40A-927D-42C0-83E7-D21B7B242317} = {4F01BCF9-13F3-4D0B-9564-F29027799B71}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9D091569-CE23-4382-B8FC-D651959BAB25}
diff --git a/src/libraries/System.Private.Uri/System.Private.Uri.sln b/src/libraries/System.Private.Uri/System.Private.Uri.sln
index 4987823743fc4..542bed9a2680f 100644
--- a/src/libraries/System.Private.Uri/System.Private.Uri.sln
+++ b/src/libraries/System.Private.Uri/System.Private.Uri.sln
@@ -19,7 +19,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", ".
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B532288A-97AF-473C-B334-E5F6F572907C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A30957A2-C729-49F1-8C75-C42D5BCB8309}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{4E14547F-0FA7-4558-B0BB-50F093DF78FC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{EB163378-F08A-4B9B-B32B-374386A30F8E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{7D234C34-A62D-4E71-87D1-898B6F51EA19}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{742F7AAD-8263-4188-911B-F0E50944B92A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{DD4121CE-1AFF-4250-BE6E-C736D001CDCB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05}"
 EndProject
@@ -27,6 +37,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E3179181-D7E
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{89A8524B-6E70-43E0-AD13-E53D499BB0A1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A30957A2-C729-49F1-8C75-C42D5BCB8309}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{7FA9EE1D-CB88-4D56-85CB-83B0E7B4A8C9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{E6972740-3028-41F0-B4D8-D0F77F0AEFD0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C9F506B9-583D-40CC-80C7-EEEF70A030DC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{7D76502A-347E-40EB-8EA2-F96040EEEEEF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -265,13 +285,117 @@ Global
 		{B532288A-97AF-473C-B334-E5F6F572907C}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{B532288A-97AF-473C-B334-E5F6F572907C}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{B532288A-97AF-473C-B334-E5F6F572907C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Debug|x64.Build.0 = Debug|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Debug|x86.Build.0 = Debug|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Release|arm.ActiveCfg = Release|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Release|x64.ActiveCfg = Release|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Release|x64.Build.0 = Release|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Release|x86.ActiveCfg = Release|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Release|x86.Build.0 = Release|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Debug|x64.Build.0 = Debug|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Debug|x86.Build.0 = Debug|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Release|arm.ActiveCfg = Release|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Release|x64.ActiveCfg = Release|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Release|x64.Build.0 = Release|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Release|x86.ActiveCfg = Release|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Release|x86.Build.0 = Release|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EB163378-F08A-4B9B-B32B-374386A30F8E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Debug|x64.Build.0 = Debug|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Debug|x86.Build.0 = Debug|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Release|arm.ActiveCfg = Release|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Release|x64.ActiveCfg = Release|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Release|x64.Build.0 = Release|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Release|x86.ActiveCfg = Release|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Release|x86.Build.0 = Release|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Debug|x64.Build.0 = Debug|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Debug|x86.Build.0 = Debug|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Release|arm.ActiveCfg = Release|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Release|x64.ActiveCfg = Release|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Release|x64.Build.0 = Release|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Release|x86.ActiveCfg = Release|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Release|x86.Build.0 = Release|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Debug|x64.Build.0 = Debug|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Debug|x86.Build.0 = Debug|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Release|arm.ActiveCfg = Release|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Release|x64.ActiveCfg = Release|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Release|x64.Build.0 = Release|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Release|x86.ActiveCfg = Release|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Release|x86.Build.0 = Release|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{742F7AAD-8263-4188-911B-F0E50944B92A}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE} = {A30957A2-C729-49F1-8C75-C42D5BCB8309}
-		{98AC821B-892E-4F58-AF3D-503747FD6A8F} = {A30957A2-C729-49F1-8C75-C42D5BCB8309}
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE} = {DD4121CE-1AFF-4250-BE6E-C736D001CDCB}
 		{ADD88187-83E2-4EAF-BFB4-BC6249E76457} = {DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05}
 		{37859855-7E5C-4772-B5D2-7029211EAB92} = {DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05}
 		{BDD0866A-D856-40EE-A9D5-1DAC11095E42} = {DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05}
@@ -280,6 +404,15 @@ Global
 		{DC61379F-5CAE-4744-A71C-3E7AAF921877} = {E3179181-D7ED-459C-B0ED-40DF10FC1959}
 		{B532288A-97AF-473C-B334-E5F6F572907C} = {E3179181-D7ED-459C-B0ED-40DF10FC1959}
 		{8153A96E-335B-4872-9EC0-39178850617B} = {89A8524B-6E70-43E0-AD13-E53D499BB0A1}
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F} = {A30957A2-C729-49F1-8C75-C42D5BCB8309}
+		{4E14547F-0FA7-4558-B0BB-50F093DF78FC} = {7FA9EE1D-CB88-4D56-85CB-83B0E7B4A8C9}
+		{EB163378-F08A-4B9B-B32B-374386A30F8E} = {7FA9EE1D-CB88-4D56-85CB-83B0E7B4A8C9}
+		{7FA9EE1D-CB88-4D56-85CB-83B0E7B4A8C9} = {7D76502A-347E-40EB-8EA2-F96040EEEEEF}
+		{A5D6D45C-1212-4E10-9DAA-55CB5EEE8CB3} = {E6972740-3028-41F0-B4D8-D0F77F0AEFD0}
+		{7D234C34-A62D-4E71-87D1-898B6F51EA19} = {E6972740-3028-41F0-B4D8-D0F77F0AEFD0}
+		{E6972740-3028-41F0-B4D8-D0F77F0AEFD0} = {7D76502A-347E-40EB-8EA2-F96040EEEEEF}
+		{742F7AAD-8263-4188-911B-F0E50944B92A} = {C9F506B9-583D-40CC-80C7-EEEF70A030DC}
+		{C9F506B9-583D-40CC-80C7-EEEF70A030DC} = {7D76502A-347E-40EB-8EA2-F96040EEEEEF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EB54DAE5-7032-48C6-8714-21ED3B5B2D1E}
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 dc508c023f3c9..882a30b7c4965 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
@@ -43,12 +43,30 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Generator", "..\System.Text.RegularExpressions\gen\System.Text.RegularExpressions.Generator.csproj", "{DB61E495-5D63-401A-88C6-6A1BB6A737ED}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{E23D8F84-8D4A-448C-9A29-CAB6E772A6AA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{7980BF36-7C21-4202-A4BA-10B03F47878B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{194AB04D-169A-45C4-8532-0B80F9D28B8E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{0453285D-3DC7-46EA-A396-761716391F97}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{177950F5-7D2E-475B-B07E-CB98A1C845CC}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4CB964C2-C69D-4A48-96A7-ACB28FBCB223}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1C4146F1-CF77-449B-865C-5E67ECF0362B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E9DEC5AA-D875-466B-9E3C-26CFD3C806D3}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CE5AAF47-0831-442D-A955-971359A0BFB7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{1A2B43DF-BF35-482E-AB93-5DFFC53CBB42}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{6AF6B518-4D3F-4EF8-8CE2-660C08AF9861}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{37DB9B48-D391-4EB3-BAAC-CC19BE03FFC9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -143,6 +161,26 @@ Global
 		{DB61E495-5D63-401A-88C6-6A1BB6A737ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DB61E495-5D63-401A-88C6-6A1BB6A737ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB61E495-5D63-401A-88C6-6A1BB6A737ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E23D8F84-8D4A-448C-9A29-CAB6E772A6AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E23D8F84-8D4A-448C-9A29-CAB6E772A6AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E23D8F84-8D4A-448C-9A29-CAB6E772A6AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E23D8F84-8D4A-448C-9A29-CAB6E772A6AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7980BF36-7C21-4202-A4BA-10B03F47878B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7980BF36-7C21-4202-A4BA-10B03F47878B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7980BF36-7C21-4202-A4BA-10B03F47878B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7980BF36-7C21-4202-A4BA-10B03F47878B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{194AB04D-169A-45C4-8532-0B80F9D28B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{194AB04D-169A-45C4-8532-0B80F9D28B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{194AB04D-169A-45C4-8532-0B80F9D28B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{194AB04D-169A-45C4-8532-0B80F9D28B8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0453285D-3DC7-46EA-A396-761716391F97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0453285D-3DC7-46EA-A396-761716391F97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0453285D-3DC7-46EA-A396-761716391F97}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0453285D-3DC7-46EA-A396-761716391F97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{177950F5-7D2E-475B-B07E-CB98A1C845CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{177950F5-7D2E-475B-B07E-CB98A1C845CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{177950F5-7D2E-475B-B07E-CB98A1C845CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{177950F5-7D2E-475B-B07E-CB98A1C845CC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -170,6 +208,14 @@ Global
 		{7F136EB7-C602-403B-84CD-753B32D699A8} = {E9DEC5AA-D875-466B-9E3C-26CFD3C806D3}
 		{D85F6247-9473-4AA3-80C8-06D65B035C98} = {E9DEC5AA-D875-466B-9E3C-26CFD3C806D3}
 		{DB61E495-5D63-401A-88C6-6A1BB6A737ED} = {E9DEC5AA-D875-466B-9E3C-26CFD3C806D3}
+		{E23D8F84-8D4A-448C-9A29-CAB6E772A6AA} = {CE5AAF47-0831-442D-A955-971359A0BFB7}
+		{7980BF36-7C21-4202-A4BA-10B03F47878B} = {CE5AAF47-0831-442D-A955-971359A0BFB7}
+		{CE5AAF47-0831-442D-A955-971359A0BFB7} = {37DB9B48-D391-4EB3-BAAC-CC19BE03FFC9}
+		{194AB04D-169A-45C4-8532-0B80F9D28B8E} = {1A2B43DF-BF35-482E-AB93-5DFFC53CBB42}
+		{0453285D-3DC7-46EA-A396-761716391F97} = {1A2B43DF-BF35-482E-AB93-5DFFC53CBB42}
+		{1A2B43DF-BF35-482E-AB93-5DFFC53CBB42} = {37DB9B48-D391-4EB3-BAAC-CC19BE03FFC9}
+		{177950F5-7D2E-475B-B07E-CB98A1C845CC} = {6AF6B518-4D3F-4EF8-8CE2-660C08AF9861}
+		{6AF6B518-4D3F-4EF8-8CE2-660C08AF9861} = {37DB9B48-D391-4EB3-BAAC-CC19BE03FFC9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {466CF638-AFDA-4A38-97EF-C87ED7B93443}
diff --git a/src/libraries/System.Private.Xml/System.Private.Xml.sln b/src/libraries/System.Private.Xml/System.Private.Xml.sln
index 72a2dd801404a..d18f2ebac9404 100644
--- a/src/libraries/System.Private.Xml/System.Private.Xml.sln
+++ b/src/libraries/System.Private.Xml/System.Private.Xml.sln
@@ -27,12 +27,30 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Generator", "..\System.Text.RegularExpressions\gen\System.Text.RegularExpressions.Generator.csproj", "{19C87966-6C1B-4CFA-9798-E989270CAB2B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{11921A7B-C18B-488A-942D-B6AD39CE0EF2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{7E5055F7-7785-4AE6-A45E-BF6105C66959}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{DBCC4731-6F0C-423E-8783-A2A76642A985}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{839EC779-FC93-4242-BC6E-2CF9B5CD7DA8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{2F4829D8-D773-4A39-BB7F-AAE0B25AE371}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E96EBB95-6AC7-4ECD-AD77-30F089F2C1F9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{41E18B29-2DB1-495A-8460-E7A257F8EA07}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{75FE1E48-B986-46E6-874F-336D74FF6C94}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{A3677F66-8D30-44E7-A407-7043DFEBF43B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{0E7E4C81-9748-4D59-9DD1-C5672CE039B0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{2B4465B9-B79C-407E-A62E-D2BD085E22BF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{8B2439BD-9FF4-46CE-A80E-9DB49C220B06}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -95,6 +113,26 @@ Global
 		{19C87966-6C1B-4CFA-9798-E989270CAB2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{19C87966-6C1B-4CFA-9798-E989270CAB2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19C87966-6C1B-4CFA-9798-E989270CAB2B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11921A7B-C18B-488A-942D-B6AD39CE0EF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11921A7B-C18B-488A-942D-B6AD39CE0EF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11921A7B-C18B-488A-942D-B6AD39CE0EF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11921A7B-C18B-488A-942D-B6AD39CE0EF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E5055F7-7785-4AE6-A45E-BF6105C66959}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E5055F7-7785-4AE6-A45E-BF6105C66959}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E5055F7-7785-4AE6-A45E-BF6105C66959}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E5055F7-7785-4AE6-A45E-BF6105C66959}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DBCC4731-6F0C-423E-8783-A2A76642A985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBCC4731-6F0C-423E-8783-A2A76642A985}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBCC4731-6F0C-423E-8783-A2A76642A985}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBCC4731-6F0C-423E-8783-A2A76642A985}.Release|Any CPU.Build.0 = Release|Any CPU
+		{839EC779-FC93-4242-BC6E-2CF9B5CD7DA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{839EC779-FC93-4242-BC6E-2CF9B5CD7DA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{839EC779-FC93-4242-BC6E-2CF9B5CD7DA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{839EC779-FC93-4242-BC6E-2CF9B5CD7DA8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F4829D8-D773-4A39-BB7F-AAE0B25AE371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F4829D8-D773-4A39-BB7F-AAE0B25AE371}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F4829D8-D773-4A39-BB7F-AAE0B25AE371}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F4829D8-D773-4A39-BB7F-AAE0B25AE371}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -114,6 +152,14 @@ Global
 		{6BC66CAC-5D61-48C2-8343-FF32DC7BC626} = {75FE1E48-B986-46E6-874F-336D74FF6C94}
 		{9CDA14FB-7312-45E7-BF4C-1E446C2242BC} = {75FE1E48-B986-46E6-874F-336D74FF6C94}
 		{19C87966-6C1B-4CFA-9798-E989270CAB2B} = {75FE1E48-B986-46E6-874F-336D74FF6C94}
+		{11921A7B-C18B-488A-942D-B6AD39CE0EF2} = {A3677F66-8D30-44E7-A407-7043DFEBF43B}
+		{7E5055F7-7785-4AE6-A45E-BF6105C66959} = {A3677F66-8D30-44E7-A407-7043DFEBF43B}
+		{A3677F66-8D30-44E7-A407-7043DFEBF43B} = {8B2439BD-9FF4-46CE-A80E-9DB49C220B06}
+		{DBCC4731-6F0C-423E-8783-A2A76642A985} = {0E7E4C81-9748-4D59-9DD1-C5672CE039B0}
+		{839EC779-FC93-4242-BC6E-2CF9B5CD7DA8} = {0E7E4C81-9748-4D59-9DD1-C5672CE039B0}
+		{0E7E4C81-9748-4D59-9DD1-C5672CE039B0} = {8B2439BD-9FF4-46CE-A80E-9DB49C220B06}
+		{2F4829D8-D773-4A39-BB7F-AAE0B25AE371} = {2B4465B9-B79C-407E-A62E-D2BD085E22BF}
+		{2B4465B9-B79C-407E-A62E-D2BD085E22BF} = {8B2439BD-9FF4-46CE-A80E-9DB49C220B06}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {80121011-1A73-45DC-80FC-B3727F3DF58C}
diff --git a/src/libraries/System.Reflection.Context/System.Reflection.Context.sln b/src/libraries/System.Reflection.Context/System.Reflection.Context.sln
index 17d4948227fd2..6e26ae1db7a92 100644
--- a/src/libraries/System.Reflection.Context/System.Reflection.Context.sln
+++ b/src/libraries/System.Reflection.Context/System.Reflection.Context.sln
@@ -7,12 +7,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context.Tests", "tests\System.Reflection.Context.Tests.csproj", "{34EA59F6-6177-4957-9894-563A73B02D63}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{4ABE7379-B93A-45BD-961B-9B53A92741FF}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{CDC2FCCA-3BDD-44D6-94E2-864684AFA61D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{7EEF6CAC-49D4-4D06-9414-2C9175898D13}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{164DAD51-B6B7-42FF-9728-1A341B4B4954}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{05C4A684-0C5B-4B7D-980B-044AB39C5F27}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{279226BA-AC16-47C4-A028-93CEA33B7042}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{CB9AE0D1-A8BE-4D57-9182-8503B8DAD978}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{EEAFF6BF-5820-41B0-A732-122D25C886E0}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C676A2DE-6F6F-44AF-B869-53C834A272AF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{31D51BA2-EB4E-4EC1-908D-EC23CB91C89D}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E460C3AC-CC6
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{AC2F6758-1191-4142-B369-6C2E27A4BEBC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{76FC7429-44DE-4EA2-A86B-0ADA71EF8EB3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{4EAD2A79-3AB4-46E8-A61D-E4C6CA8A0112}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{21654DCB-2787-4516-8FD6-A0FD4E4EADE9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{7A6C79A3-F42D-41BE-8003-A8678ECD8809}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{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
-		{4ABE7379-B93A-45BD-961B-9B53A92741FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4ABE7379-B93A-45BD-961B-9B53A92741FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4ABE7379-B93A-45BD-961B-9B53A92741FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4ABE7379-B93A-45BD-961B-9B53A92741FF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CDC2FCCA-3BDD-44D6-94E2-864684AFA61D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CDC2FCCA-3BDD-44D6-94E2-864684AFA61D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CDC2FCCA-3BDD-44D6-94E2-864684AFA61D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{7EEF6CAC-49D4-4D06-9414-2C9175898D13}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7EEF6CAC-49D4-4D06-9414-2C9175898D13}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7EEF6CAC-49D4-4D06-9414-2C9175898D13}.Release|Any CPU.Build.0 = Release|Any CPU
+		{164DAD51-B6B7-42FF-9728-1A341B4B4954}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{164DAD51-B6B7-42FF-9728-1A341B4B4954}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{164DAD51-B6B7-42FF-9728-1A341B4B4954}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{164DAD51-B6B7-42FF-9728-1A341B4B4954}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05C4A684-0C5B-4B7D-980B-044AB39C5F27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05C4A684-0C5B-4B7D-980B-044AB39C5F27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05C4A684-0C5B-4B7D-980B-044AB39C5F27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05C4A684-0C5B-4B7D-980B-044AB39C5F27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{279226BA-AC16-47C4-A028-93CEA33B7042}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{279226BA-AC16-47C4-A028-93CEA33B7042}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{279226BA-AC16-47C4-A028-93CEA33B7042}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{279226BA-AC16-47C4-A028-93CEA33B7042}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB9AE0D1-A8BE-4D57-9182-8503B8DAD978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB9AE0D1-A8BE-4D57-9182-8503B8DAD978}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB9AE0D1-A8BE-4D57-9182-8503B8DAD978}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB9AE0D1-A8BE-4D57-9182-8503B8DAD978}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEAFF6BF-5820-41B0-A732-122D25C886E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEAFF6BF-5820-41B0-A732-122D25C886E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEAFF6BF-5820-41B0-A732-122D25C886E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEAFF6BF-5820-41B0-A732-122D25C886E0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,9 +96,16 @@ Global
 		{34EA59F6-6177-4957-9894-563A73B02D63} = {C676A2DE-6F6F-44AF-B869-53C834A272AF}
 		{B2EBCE83-FA49-4ECD-9E8E-AF231AADFF67} = {31D51BA2-EB4E-4EC1-908D-EC23CB91C89D}
 		{794EAE71-36BA-436D-841A-A8C72AADF485} = {E460C3AC-CC68-44E7-9256-75062C1CF587}
-		{4ABE7379-B93A-45BD-961B-9B53A92741FF} = {AC2F6758-1191-4142-B369-6C2E27A4BEBC}
 		{CDC2FCCA-3BDD-44D6-94E2-864684AFA61D} = {AC2F6758-1191-4142-B369-6C2E27A4BEBC}
 		{7EEF6CAC-49D4-4D06-9414-2C9175898D13} = {AC2F6758-1191-4142-B369-6C2E27A4BEBC}
+		{164DAD51-B6B7-42FF-9728-1A341B4B4954} = {76FC7429-44DE-4EA2-A86B-0ADA71EF8EB3}
+		{05C4A684-0C5B-4B7D-980B-044AB39C5F27} = {76FC7429-44DE-4EA2-A86B-0ADA71EF8EB3}
+		{76FC7429-44DE-4EA2-A86B-0ADA71EF8EB3} = {7A6C79A3-F42D-41BE-8003-A8678ECD8809}
+		{279226BA-AC16-47C4-A028-93CEA33B7042} = {4EAD2A79-3AB4-46E8-A61D-E4C6CA8A0112}
+		{CB9AE0D1-A8BE-4D57-9182-8503B8DAD978} = {4EAD2A79-3AB4-46E8-A61D-E4C6CA8A0112}
+		{4EAD2A79-3AB4-46E8-A61D-E4C6CA8A0112} = {7A6C79A3-F42D-41BE-8003-A8678ECD8809}
+		{EEAFF6BF-5820-41B0-A732-122D25C886E0} = {21654DCB-2787-4516-8FD6-A0FD4E4EADE9}
+		{21654DCB-2787-4516-8FD6-A0FD4E4EADE9} = {7A6C79A3-F42D-41BE-8003-A8678ECD8809}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BD91D429-58C1-4CA3-A800-E308C697485B}
diff --git a/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln b/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
index edff430260916..63e606f05d41f 100644
--- a/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
+++ b/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
@@ -15,6 +15,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{A7AB7982-726A-47D1-AD9E-4306FECE5F4B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{49563DBE-6B20-4BED-ADF7-0FD7724299D8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{77BBC09A-4D62-438E-BEFC-4F5EFB2061CB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{2195DEDC-49AA-4B26-80F4-8EACBCA4AAA1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{0C838AF6-FD56-4A00-9EAF-C572F40DEAC1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{5E688972-12CF-4E0A-B3EC-8BF6B938CE02}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A93B0848-1831-47F3-AE2E-196950D1BBF0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F1A0875B-0263-4071-8847-F0A2C479F6F9}"
@@ -23,6 +33,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{95661E1D-F86
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{03BEF49E-85A2-49A8-9A48-EF93FA21B743}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{B5966BF5-E3ED-494C-9CE1-04A172C511B5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{DA07298D-68FD-420D-BD83-21C1A5D1D2D1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{61A03505-3274-4799-975D-C48EF7A55646}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{D064C025-020C-4DDA-B74A-72D8D49BAEEC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,6 +79,26 @@ Global
 		{A7AB7982-726A-47D1-AD9E-4306FECE5F4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A7AB7982-726A-47D1-AD9E-4306FECE5F4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A7AB7982-726A-47D1-AD9E-4306FECE5F4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49563DBE-6B20-4BED-ADF7-0FD7724299D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49563DBE-6B20-4BED-ADF7-0FD7724299D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49563DBE-6B20-4BED-ADF7-0FD7724299D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49563DBE-6B20-4BED-ADF7-0FD7724299D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77BBC09A-4D62-438E-BEFC-4F5EFB2061CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77BBC09A-4D62-438E-BEFC-4F5EFB2061CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77BBC09A-4D62-438E-BEFC-4F5EFB2061CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77BBC09A-4D62-438E-BEFC-4F5EFB2061CB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2195DEDC-49AA-4B26-80F4-8EACBCA4AAA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2195DEDC-49AA-4B26-80F4-8EACBCA4AAA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2195DEDC-49AA-4B26-80F4-8EACBCA4AAA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2195DEDC-49AA-4B26-80F4-8EACBCA4AAA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C838AF6-FD56-4A00-9EAF-C572F40DEAC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C838AF6-FD56-4A00-9EAF-C572F40DEAC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C838AF6-FD56-4A00-9EAF-C572F40DEAC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C838AF6-FD56-4A00-9EAF-C572F40DEAC1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E688972-12CF-4E0A-B3EC-8BF6B938CE02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E688972-12CF-4E0A-B3EC-8BF6B938CE02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E688972-12CF-4E0A-B3EC-8BF6B938CE02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E688972-12CF-4E0A-B3EC-8BF6B938CE02}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -74,6 +112,14 @@ Global
 		{F5A284B5-10D3-43D4-BB3F-F0FB55033504} = {95661E1D-F86D-4EDC-AF44-E0F782BB7E4B}
 		{8FC6C206-76D5-4FE2-A7A4-C0B6597709AF} = {03BEF49E-85A2-49A8-9A48-EF93FA21B743}
 		{318BE680-88DD-478B-ABA8-B19C1BBB93E9} = {03BEF49E-85A2-49A8-9A48-EF93FA21B743}
+		{49563DBE-6B20-4BED-ADF7-0FD7724299D8} = {B5966BF5-E3ED-494C-9CE1-04A172C511B5}
+		{77BBC09A-4D62-438E-BEFC-4F5EFB2061CB} = {B5966BF5-E3ED-494C-9CE1-04A172C511B5}
+		{B5966BF5-E3ED-494C-9CE1-04A172C511B5} = {D064C025-020C-4DDA-B74A-72D8D49BAEEC}
+		{2195DEDC-49AA-4B26-80F4-8EACBCA4AAA1} = {DA07298D-68FD-420D-BD83-21C1A5D1D2D1}
+		{0C838AF6-FD56-4A00-9EAF-C572F40DEAC1} = {DA07298D-68FD-420D-BD83-21C1A5D1D2D1}
+		{DA07298D-68FD-420D-BD83-21C1A5D1D2D1} = {D064C025-020C-4DDA-B74A-72D8D49BAEEC}
+		{5E688972-12CF-4E0A-B3EC-8BF6B938CE02} = {61A03505-3274-4799-975D-C48EF7A55646}
+		{61A03505-3274-4799-975D-C48EF7A55646} = {D064C025-020C-4DDA-B74A-72D8D49BAEEC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {32381969-33E3-4DA1-A3DD-82AC1EA2FF9E}
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 ed7d27fec4cb6..d05eb1efa931d 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
@@ -25,7 +25,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{81204A19-8DF3-461B-A5FE-7B85149F5CCD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C723F596-B189-428C-A090-F4965F87A73D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{6B47F791-1C84-4B75-B04B-076E9ACBF954}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{E5399050-E71C-4B05-8DD0-9ED058F66F43}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{F8E304FE-819F-483A-B1B2-883C6E18B41F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{61C529DF-66C4-42E9-AE70-3427838FAFE3}"
 EndProject
@@ -33,6 +43,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A20A0878-564
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{155A2103-05C1-4020-8922-4F6275F6AE7E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C723F596-B189-428C-A090-F4965F87A73D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CA60D894-129C-47A8-BDC7-C11E8D67913A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{FC6D5A7E-628F-43EE-A2D9-A07C7032EA5F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{51626095-E4FC-493E-9459-3B9ABC4C7E3F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{62AB992D-D3B5-4704-8915-4CF93A6E9AD0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -334,13 +354,117 @@ Global
 		{81204A19-8DF3-461B-A5FE-7B85149F5CCD}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{81204A19-8DF3-461B-A5FE-7B85149F5CCD}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{81204A19-8DF3-461B-A5FE-7B85149F5CCD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Debug|x64.Build.0 = Debug|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Debug|x86.Build.0 = Debug|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Release|arm.ActiveCfg = Release|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Release|x64.ActiveCfg = Release|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Release|x64.Build.0 = Release|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Release|x86.ActiveCfg = Release|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Release|x86.Build.0 = Release|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Debug|x64.Build.0 = Debug|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Debug|x86.Build.0 = Debug|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Release|Any CPU.Build.0 = Release|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Release|arm.ActiveCfg = Release|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Release|arm64.ActiveCfg = Release|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Release|x64.ActiveCfg = Release|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Release|x64.Build.0 = Release|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Release|x86.ActiveCfg = Release|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Release|x86.Build.0 = Release|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Debug|x64.Build.0 = Debug|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Debug|x86.Build.0 = Debug|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Release|arm.ActiveCfg = Release|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Release|arm64.ActiveCfg = Release|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Release|x64.ActiveCfg = Release|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Release|x64.Build.0 = Release|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Release|x86.ActiveCfg = Release|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Release|x86.Build.0 = Release|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Debug|x86.Build.0 = Debug|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Release|arm.ActiveCfg = Release|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Release|x64.Build.0 = Release|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Release|x86.Build.0 = Release|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Debug|x64.Build.0 = Debug|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Debug|x86.Build.0 = Debug|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Release|arm.ActiveCfg = Release|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Release|x64.ActiveCfg = Release|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Release|x64.Build.0 = Release|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Release|x86.ActiveCfg = Release|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Release|x86.Build.0 = Release|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{B1053D24-237E-4E55-9413-20B34ED79F23} = {C723F596-B189-428C-A090-F4965F87A73D}
-		{A18E814C-13D6-4859-B6FA-3CAB8673B31F} = {C723F596-B189-428C-A090-F4965F87A73D}
+		{B1053D24-237E-4E55-9413-20B34ED79F23} = {F8E304FE-819F-483A-B1B2-883C6E18B41F}
 		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717} = {61C529DF-66C4-42E9-AE70-3427838FAFE3}
 		{EA6F01DF-1F63-49FF-A6E8-CA9104296196} = {61C529DF-66C4-42E9-AE70-3427838FAFE3}
 		{5EC8FDE3-DD46-4D89-80AC-AEF571C405B1} = {A20A0878-5647-4145-B224-C390446B7676}
@@ -352,6 +476,15 @@ Global
 		{8843EA69-AD8F-4C73-8436-1641470199DC} = {155A2103-05C1-4020-8922-4F6275F6AE7E}
 		{FFA71ACB-EAD8-4242-A5D6-FBB3F704949D} = {155A2103-05C1-4020-8922-4F6275F6AE7E}
 		{3461E542-7F19-4B98-B206-BDF932529A5B} = {155A2103-05C1-4020-8922-4F6275F6AE7E}
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F} = {C723F596-B189-428C-A090-F4965F87A73D}
+		{6B47F791-1C84-4B75-B04B-076E9ACBF954} = {CA60D894-129C-47A8-BDC7-C11E8D67913A}
+		{134F392F-0DDF-4C9C-A35C-CD6A43DBD992} = {CA60D894-129C-47A8-BDC7-C11E8D67913A}
+		{CA60D894-129C-47A8-BDC7-C11E8D67913A} = {62AB992D-D3B5-4704-8915-4CF93A6E9AD0}
+		{492B3A0B-F2B8-437C-BAF5-16E918E8E2DC} = {FC6D5A7E-628F-43EE-A2D9-A07C7032EA5F}
+		{E5399050-E71C-4B05-8DD0-9ED058F66F43} = {FC6D5A7E-628F-43EE-A2D9-A07C7032EA5F}
+		{FC6D5A7E-628F-43EE-A2D9-A07C7032EA5F} = {62AB992D-D3B5-4704-8915-4CF93A6E9AD0}
+		{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1} = {51626095-E4FC-493E-9459-3B9ABC4C7E3F}
+		{51626095-E4FC-493E-9459-3B9ABC4C7E3F} = {62AB992D-D3B5-4704-8915-4CF93A6E9AD0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {248E0825-3C88-4854-B192-C50C9FDDBBC3}
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 68d33a14d5518..5f45d76e495bd 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
@@ -27,7 +27,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{86ED21D3-93FC-4FFE-927F-CDB404D71434}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C3D946CF-3A37-4EA5-AE14-AC84AF9746F1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{5EA13609-79BF-4B45-A288-ED20A54E4263}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{C8D32DC5-846B-4236-8C9B-583E1C137DEB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{000EAACD-7729-43C5-89CA-28D3CBF0592D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{302F3CA0-2A35-4497-9A9A-D251385565A9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FF41EFDD-DD1F-428F-B25E-DD9B85D5A992}"
 EndProject
@@ -35,6 +45,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2AB40A0A-24D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{09AE6FA7-7363-4994-BC62-3685AE151227}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C3D946CF-3A37-4EA5-AE14-AC84AF9746F1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{81C68A3F-A099-40EE-9F8C-FDA2EEFF1B7B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{59929B38-7B6B-4433-82F0-73B8950B76A1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{B5C46E1A-71C1-4814-9682-F2EE6C02FBCB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{E3A09A0E-7044-406D-89D8-CC3B3BDC8D98}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -357,13 +377,117 @@ Global
 		{86ED21D3-93FC-4FFE-927F-CDB404D71434}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{86ED21D3-93FC-4FFE-927F-CDB404D71434}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{86ED21D3-93FC-4FFE-927F-CDB404D71434}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Debug|x64.Build.0 = Debug|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Debug|x86.Build.0 = Debug|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Release|arm.ActiveCfg = Release|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Release|arm64.ActiveCfg = Release|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Release|x64.ActiveCfg = Release|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Release|x64.Build.0 = Release|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Release|x86.ActiveCfg = Release|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Release|x86.Build.0 = Release|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5EA13609-79BF-4B45-A288-ED20A54E4263}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Debug|x64.Build.0 = Debug|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Debug|x86.Build.0 = Debug|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Release|arm.ActiveCfg = Release|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Release|x64.ActiveCfg = Release|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Release|x64.Build.0 = Release|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Release|x86.ActiveCfg = Release|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Release|x86.Build.0 = Release|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Debug|x64.Build.0 = Debug|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Debug|x86.Build.0 = Debug|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Release|arm.ActiveCfg = Release|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Release|x64.ActiveCfg = Release|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Release|x64.Build.0 = Release|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Release|x86.ActiveCfg = Release|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Release|x86.Build.0 = Release|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Debug|x64.Build.0 = Debug|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Debug|x86.Build.0 = Debug|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Release|arm.ActiveCfg = Release|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Release|arm64.ActiveCfg = Release|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Release|x64.ActiveCfg = Release|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Release|x64.Build.0 = Release|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Release|x86.ActiveCfg = Release|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Release|x86.Build.0 = Release|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Debug|x64.Build.0 = Debug|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Debug|x86.Build.0 = Debug|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Release|arm.ActiveCfg = Release|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Release|x64.ActiveCfg = Release|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Release|x64.Build.0 = Release|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Release|x86.ActiveCfg = Release|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Release|x86.Build.0 = Release|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{209EDA22-1D20-4180-BE4C-53DEE1758B5D} = {C3D946CF-3A37-4EA5-AE14-AC84AF9746F1}
-		{BC6947B4-C61B-4066-B75F-937992548E54} = {C3D946CF-3A37-4EA5-AE14-AC84AF9746F1}
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D} = {302F3CA0-2A35-4497-9A9A-D251385565A9}
 		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A} = {FF41EFDD-DD1F-428F-B25E-DD9B85D5A992}
 		{13447BAB-2762-4CCC-95DF-531FC82FE39A} = {FF41EFDD-DD1F-428F-B25E-DD9B85D5A992}
 		{9F022877-F110-4761-BA97-CC89BBC16D5A} = {2AB40A0A-24D5-40B9-AA94-5BF17878879A}
@@ -376,6 +500,15 @@ Global
 		{165A3077-1F79-46E7-8BFA-88AACEB6D026} = {09AE6FA7-7363-4994-BC62-3685AE151227}
 		{40E15C1B-0AB8-4FC5-9CE2-062B736F9021} = {09AE6FA7-7363-4994-BC62-3685AE151227}
 		{913E983B-B16C-4B1E-BD37-906CFF93CAB4} = {09AE6FA7-7363-4994-BC62-3685AE151227}
+		{BC6947B4-C61B-4066-B75F-937992548E54} = {C3D946CF-3A37-4EA5-AE14-AC84AF9746F1}
+		{5EA13609-79BF-4B45-A288-ED20A54E4263} = {81C68A3F-A099-40EE-9F8C-FDA2EEFF1B7B}
+		{C8D32DC5-846B-4236-8C9B-583E1C137DEB} = {81C68A3F-A099-40EE-9F8C-FDA2EEFF1B7B}
+		{81C68A3F-A099-40EE-9F8C-FDA2EEFF1B7B} = {E3A09A0E-7044-406D-89D8-CC3B3BDC8D98}
+		{000EAACD-7729-43C5-89CA-28D3CBF0592D} = {59929B38-7B6B-4433-82F0-73B8950B76A1}
+		{3A9FF6BB-FD1B-4A96-AE46-A4767B18EF65} = {59929B38-7B6B-4433-82F0-73B8950B76A1}
+		{59929B38-7B6B-4433-82F0-73B8950B76A1} = {E3A09A0E-7044-406D-89D8-CC3B3BDC8D98}
+		{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A} = {B5C46E1A-71C1-4814-9682-F2EE6C02FBCB}
+		{B5C46E1A-71C1-4814-9682-F2EE6C02FBCB} = {E3A09A0E-7044-406D-89D8-CC3B3BDC8D98}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC34C129-6D43-4A78-966A-9152BFF226C0}
diff --git a/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln b/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln
index b774027405c40..4799520a8e5e6 100644
--- a/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln
+++ b/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{772C93D4-FC45-46AA-B09F-26F01B672EDC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E5543842-139D-43BD-B604-E65EBB91649E}"
@@ -45,14 +45,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{BB96A2BA-44E9-43FA-91B1-CCEE212C6A8A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{74F4AB97-3DBC-48FB-A2EA-2B4141749800}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{30B7883D-A8B5-47F2-B242-971D585483B8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{4F5987F2-614A-42B6-A652-FE4C03330DE0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{ED65A29E-5F42-409D-BAAC-548799C6C35A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2FC35C2F-76DB-4D84-B421-9700BEA4D161}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C36D185D-9B3D-42E5-985F-E21B3BAF3B6D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{74F4AB97-3DBC-48FB-A2EA-2B4141749800}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{611CB559-49A7-4046-9425-50E25205E891}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{59251F20-422C-41BC-9C0E-4517B5C2018D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{AA8FF9D5-BB95-481B-A56A-E8FAF9725F97}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{A3402532-58BD-4AB1-870F-CFD829CEAD18}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -564,18 +584,117 @@ Global
 		{BB96A2BA-44E9-43FA-91B1-CCEE212C6A8A}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{BB96A2BA-44E9-43FA-91B1-CCEE212C6A8A}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{BB96A2BA-44E9-43FA-91B1-CCEE212C6A8A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Debug|x64.Build.0 = Debug|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Debug|x86.Build.0 = Debug|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Release|arm.ActiveCfg = Release|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Release|x64.ActiveCfg = Release|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Release|x64.Build.0 = Release|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Release|x86.ActiveCfg = Release|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Release|x86.Build.0 = Release|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Debug|x64.Build.0 = Debug|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Debug|x86.Build.0 = Debug|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Release|arm.ActiveCfg = Release|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Release|x64.ActiveCfg = Release|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Release|x64.Build.0 = Release|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Release|x86.ActiveCfg = Release|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Release|x86.Build.0 = Release|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Debug|x64.Build.0 = Debug|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Debug|x86.Build.0 = Debug|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Release|arm.ActiveCfg = Release|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Release|x64.ActiveCfg = Release|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Release|x64.Build.0 = Release|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Release|x86.ActiveCfg = Release|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Release|x86.Build.0 = Release|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{30B7883D-A8B5-47F2-B242-971D585483B8}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Debug|x64.Build.0 = Debug|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Debug|x86.Build.0 = Debug|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Release|arm.ActiveCfg = Release|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Release|arm64.ActiveCfg = Release|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Release|x64.ActiveCfg = Release|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Release|x64.Build.0 = Release|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Release|x86.ActiveCfg = Release|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Release|x86.Build.0 = Release|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Debug|x64.Build.0 = Debug|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Debug|x86.Build.0 = Debug|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Release|arm.ActiveCfg = Release|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Release|x64.ActiveCfg = Release|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Release|x64.Build.0 = Release|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Release|x86.ActiveCfg = Release|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Release|x86.Build.0 = Release|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{772C93D4-FC45-46AA-B09F-26F01B672EDC} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800}
-		{C2FF5BC7-825E-437E-92C3-F505EB6D1D40} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800}
-		{D5FD16CF-7435-4E47-928A-9BC94968091D} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800}
-		{B479A4BF-A3A5-4255-A3EF-135015BD877F} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800}
-		{F33093A8-FF33-4F95-B256-F2AB712C956A} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800}
-		{9F3970FF-F138-4F23-A2F8-2387858E723D} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800}
-		{BB96A2BA-44E9-43FA-91B1-CCEE212C6A8A} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800}
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC} = {ED65A29E-5F42-409D-BAAC-548799C6C35A}
 		{E5543842-139D-43BD-B604-E65EBB91649E} = {2FC35C2F-76DB-4D84-B421-9700BEA4D161}
 		{82899000-791E-42FF-A594-6DE65DE07C9E} = {2FC35C2F-76DB-4D84-B421-9700BEA4D161}
 		{DE04D45B-7E15-409D-A176-985D814A6AEB} = {C36D185D-9B3D-42E5-985F-E21B3BAF3B6D}
@@ -588,12 +707,26 @@ Global
 		{FD4D647F-490B-420A-B2FD-29751E0C3454} = {C36D185D-9B3D-42E5-985F-E21B3BAF3B6D}
 		{8E08BBCB-E2D1-464F-96F1-7B1801CE48B6} = {C36D185D-9B3D-42E5-985F-E21B3BAF3B6D}
 		{613C42F2-847A-42B3-9F5E-F5A670356BF7} = {C36D185D-9B3D-42E5-985F-E21B3BAF3B6D}
+		{C2FF5BC7-825E-437E-92C3-F505EB6D1D40} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800}
+		{D5FD16CF-7435-4E47-928A-9BC94968091D} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800}
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800}
+		{F33093A8-FF33-4F95-B256-F2AB712C956A} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800}
+		{9F3970FF-F138-4F23-A2F8-2387858E723D} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800}
+		{BB96A2BA-44E9-43FA-91B1-CCEE212C6A8A} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800}
 		{848EFB55-86B5-4259-BAA2-A49C6E3421A9} = {EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B}
 		{A2A7CB52-1BC2-40EA-885F-DD5DE607AC96} = {EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B}
 		{73EA94AD-0C65-47C8-851C-12D136A0DCC1} = {EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B}
 		{506EBBFA-FF57-4141-A725-882110C17598} = {EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B}
+		{AD7C04D0-8F8C-4114-975F-804C5E30C5D6} = {611CB559-49A7-4046-9425-50E25205E891}
+		{90044FD3-5C5C-4FB8-B7C7-F9DEF519EE7D} = {611CB559-49A7-4046-9425-50E25205E891}
+		{611CB559-49A7-4046-9425-50E25205E891} = {A3402532-58BD-4AB1-870F-CFD829CEAD18}
+		{30B7883D-A8B5-47F2-B242-971D585483B8} = {59251F20-422C-41BC-9C0E-4517B5C2018D}
+		{5D8AE6D8-F7EC-43AC-AE7E-80B85A460258} = {59251F20-422C-41BC-9C0E-4517B5C2018D}
+		{59251F20-422C-41BC-9C0E-4517B5C2018D} = {A3402532-58BD-4AB1-870F-CFD829CEAD18}
+		{4F5987F2-614A-42B6-A652-FE4C03330DE0} = {AA8FF9D5-BB95-481B-A56A-E8FAF9725F97}
+		{AA8FF9D5-BB95-481B-A56A-E8FAF9725F97} = {A3402532-58BD-4AB1-870F-CFD829CEAD18}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {739AA767-154B-4C69-8C9B-C3D332833D92}
 	EndGlobalSection
-EndGlobal
\ No newline at end of file
+EndGlobal
diff --git a/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln b/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
index e43d31fd03983..1dae15e99b380 100644
--- a/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
+++ b/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
@@ -21,6 +21,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{4D7BBEC2-8A8D-4BAA-AD6B-55905F107317}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{8E173D5F-6011-4471-8514-FF9C7D4417B5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{064431FF-EE86-4C61-8859-0F824AD2B69A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{35B39665-CBB5-449F-B51D-91B1B021266F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{98445B72-AFD2-462C-94F2-65E5C1A25B22}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{CDFCF052-9073-42E3-BC4F-5283E9BFAD1B}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{57E0E2C2-76DD-4219-B164-E513C4F8BE01}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0829DF11-6008-4678-B608-D754E87EBC70}"
@@ -29,6 +39,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5E8418DF-67A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{3FDA41E5-7DFA-48DC-856B-09E5747E3C9C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{FA7C2C03-A446-4807-A092-9A3ABD5E5FD7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{19CD37AB-E6A2-431C-8893-5ED903B847BA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{B80A55DB-C1C4-4A99-A1C8-BFD6606C28AF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{5224A519-F2DB-487E-AB04-CB1C45853202}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,6 +97,26 @@ Global
 		{4D7BBEC2-8A8D-4BAA-AD6B-55905F107317}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4D7BBEC2-8A8D-4BAA-AD6B-55905F107317}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4D7BBEC2-8A8D-4BAA-AD6B-55905F107317}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E173D5F-6011-4471-8514-FF9C7D4417B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E173D5F-6011-4471-8514-FF9C7D4417B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E173D5F-6011-4471-8514-FF9C7D4417B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E173D5F-6011-4471-8514-FF9C7D4417B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{064431FF-EE86-4C61-8859-0F824AD2B69A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{064431FF-EE86-4C61-8859-0F824AD2B69A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{064431FF-EE86-4C61-8859-0F824AD2B69A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{064431FF-EE86-4C61-8859-0F824AD2B69A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{35B39665-CBB5-449F-B51D-91B1B021266F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35B39665-CBB5-449F-B51D-91B1B021266F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35B39665-CBB5-449F-B51D-91B1B021266F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35B39665-CBB5-449F-B51D-91B1B021266F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98445B72-AFD2-462C-94F2-65E5C1A25B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98445B72-AFD2-462C-94F2-65E5C1A25B22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98445B72-AFD2-462C-94F2-65E5C1A25B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98445B72-AFD2-462C-94F2-65E5C1A25B22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CDFCF052-9073-42E3-BC4F-5283E9BFAD1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDFCF052-9073-42E3-BC4F-5283E9BFAD1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDFCF052-9073-42E3-BC4F-5283E9BFAD1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CDFCF052-9073-42E3-BC4F-5283E9BFAD1B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -95,6 +133,14 @@ Global
 		{D4293B41-CA47-46DB-8E11-C532E8E8DAF1} = {3FDA41E5-7DFA-48DC-856B-09E5747E3C9C}
 		{1092AC3C-B01C-4AC4-9F05-6FDB23C699B3} = {3FDA41E5-7DFA-48DC-856B-09E5747E3C9C}
 		{930B1167-83BE-42CC-BFED-096CB2BA19F1} = {3FDA41E5-7DFA-48DC-856B-09E5747E3C9C}
+		{8E173D5F-6011-4471-8514-FF9C7D4417B5} = {FA7C2C03-A446-4807-A092-9A3ABD5E5FD7}
+		{064431FF-EE86-4C61-8859-0F824AD2B69A} = {FA7C2C03-A446-4807-A092-9A3ABD5E5FD7}
+		{FA7C2C03-A446-4807-A092-9A3ABD5E5FD7} = {5224A519-F2DB-487E-AB04-CB1C45853202}
+		{35B39665-CBB5-449F-B51D-91B1B021266F} = {19CD37AB-E6A2-431C-8893-5ED903B847BA}
+		{98445B72-AFD2-462C-94F2-65E5C1A25B22} = {19CD37AB-E6A2-431C-8893-5ED903B847BA}
+		{19CD37AB-E6A2-431C-8893-5ED903B847BA} = {5224A519-F2DB-487E-AB04-CB1C45853202}
+		{CDFCF052-9073-42E3-BC4F-5283E9BFAD1B} = {B80A55DB-C1C4-4A99-A1C8-BFD6606C28AF}
+		{B80A55DB-C1C4-4A99-A1C8-BFD6606C28AF} = {5224A519-F2DB-487E-AB04-CB1C45853202}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {64BB97AB-FD23-40BA-B638-FE4756AE6452}
diff --git a/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln b/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
index d4bd203f140e8..41c9548eefda2 100644
--- a/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
+++ b/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
@@ -27,6 +27,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{C3084E13-4286-4B12-8156-D3595903CF44}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{97EB26A9-6F04-4C1B-9977-AA9BFF7F5802}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{B03B0B10-85A2-46BD-94EB-BD1E89A1D83E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{A57C649D-817B-4E03-9C9C-6CE45822F596}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{39CCC14C-DA96-4051-90FC-B6CCADBE9D6E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{1B9FA129-0295-499B-A48B-8E4B3C47151A}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F45DECCA-03D3-4087-AB01-F099C027DC33}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B3731232-B2FE-401B-A9F1-5DFB1A90D687}"
@@ -35,6 +45,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C9409DA5-0A3
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E86A915C-E800-4558-AFDC-F41C4095B2DF}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0A7CB728-67D0-4F8C-8102-4F433790B9EA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{C965D66B-8014-46D0-84A6-6C3FAC80756F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{9772F96B-9277-4E65-B49E-51A7CBB30D13}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{D29E56EA-B9AD-40F2-9271-C2C87EEC70B2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +115,26 @@ Global
 		{C3084E13-4286-4B12-8156-D3595903CF44}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C3084E13-4286-4B12-8156-D3595903CF44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C3084E13-4286-4B12-8156-D3595903CF44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97EB26A9-6F04-4C1B-9977-AA9BFF7F5802}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97EB26A9-6F04-4C1B-9977-AA9BFF7F5802}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97EB26A9-6F04-4C1B-9977-AA9BFF7F5802}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97EB26A9-6F04-4C1B-9977-AA9BFF7F5802}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B03B0B10-85A2-46BD-94EB-BD1E89A1D83E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B03B0B10-85A2-46BD-94EB-BD1E89A1D83E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B03B0B10-85A2-46BD-94EB-BD1E89A1D83E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B03B0B10-85A2-46BD-94EB-BD1E89A1D83E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A57C649D-817B-4E03-9C9C-6CE45822F596}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A57C649D-817B-4E03-9C9C-6CE45822F596}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A57C649D-817B-4E03-9C9C-6CE45822F596}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A57C649D-817B-4E03-9C9C-6CE45822F596}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39CCC14C-DA96-4051-90FC-B6CCADBE9D6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39CCC14C-DA96-4051-90FC-B6CCADBE9D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39CCC14C-DA96-4051-90FC-B6CCADBE9D6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39CCC14C-DA96-4051-90FC-B6CCADBE9D6E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B9FA129-0295-499B-A48B-8E4B3C47151A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B9FA129-0295-499B-A48B-8E4B3C47151A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B9FA129-0295-499B-A48B-8E4B3C47151A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B9FA129-0295-499B-A48B-8E4B3C47151A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -116,6 +154,14 @@ Global
 		{97806F4F-CCA5-4B86-9B71-B3B35DC990E1} = {E86A915C-E800-4558-AFDC-F41C4095B2DF}
 		{4361CEFA-8238-4247-9CC5-D99DF794843C} = {E86A915C-E800-4558-AFDC-F41C4095B2DF}
 		{7393C7CD-4C31-4B1C-96DC-1D46D240538A} = {E86A915C-E800-4558-AFDC-F41C4095B2DF}
+		{97EB26A9-6F04-4C1B-9977-AA9BFF7F5802} = {0A7CB728-67D0-4F8C-8102-4F433790B9EA}
+		{B03B0B10-85A2-46BD-94EB-BD1E89A1D83E} = {0A7CB728-67D0-4F8C-8102-4F433790B9EA}
+		{0A7CB728-67D0-4F8C-8102-4F433790B9EA} = {D29E56EA-B9AD-40F2-9271-C2C87EEC70B2}
+		{A57C649D-817B-4E03-9C9C-6CE45822F596} = {C965D66B-8014-46D0-84A6-6C3FAC80756F}
+		{39CCC14C-DA96-4051-90FC-B6CCADBE9D6E} = {C965D66B-8014-46D0-84A6-6C3FAC80756F}
+		{C965D66B-8014-46D0-84A6-6C3FAC80756F} = {D29E56EA-B9AD-40F2-9271-C2C87EEC70B2}
+		{1B9FA129-0295-499B-A48B-8E4B3C47151A} = {9772F96B-9277-4E65-B49E-51A7CBB30D13}
+		{9772F96B-9277-4E65-B49E-51A7CBB30D13} = {D29E56EA-B9AD-40F2-9271-C2C87EEC70B2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CA7F05F8-4589-46FA-9AC5-4F96F2AE890C}
diff --git a/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln b/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln
index 71dd35761b1f2..6d26b4d35d6ff 100644
--- a/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln
+++ b/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln
@@ -15,12 +15,32 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{04E09F3E-1897-43EE-94D3-786B679CB741}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{E7D92072-71A6-47A2-90C0-75CBA3672693}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{908620B9-2483-46A3-A93E-78ECB5417BAF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{654344FB-C5C8-4364-B43B-C2C9530B96F8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4599348B-0480-47D4-9763-F3C6716D3CCC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{6165604E-507C-41D7-AE23-C2CE4E64F685}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{CD5918A8-A5E7-4B14-AF36-015CE2D6EB2D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{4D27F9A8-F756-4850-A220-2CCA3DA1C45D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{72BF7E3E-3778-4D65-8362-F301090B8B02}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -217,19 +237,132 @@ Global
 		{04E09F3E-1897-43EE-94D3-786B679CB741}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{04E09F3E-1897-43EE-94D3-786B679CB741}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{04E09F3E-1897-43EE-94D3-786B679CB741}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Debug|x64.Build.0 = Debug|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Debug|x86.Build.0 = Debug|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Release|arm.ActiveCfg = Release|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Release|x64.ActiveCfg = Release|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Release|x64.Build.0 = Release|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Release|x86.ActiveCfg = Release|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Release|x86.Build.0 = Release|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Debug|x64.Build.0 = Debug|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Debug|x86.Build.0 = Debug|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Release|arm.ActiveCfg = Release|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Release|x64.ActiveCfg = Release|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Release|x64.Build.0 = Release|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Release|x86.ActiveCfg = Release|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Release|x86.Build.0 = Release|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Debug|x64.Build.0 = Debug|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Debug|x86.Build.0 = Debug|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Release|arm.ActiveCfg = Release|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Release|x64.ActiveCfg = Release|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Release|x64.Build.0 = Release|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Release|x86.ActiveCfg = Release|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Release|x86.Build.0 = Release|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Debug|x64.Build.0 = Debug|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Debug|x86.Build.0 = Debug|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Release|arm.ActiveCfg = Release|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Release|arm64.ActiveCfg = Release|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Release|x64.ActiveCfg = Release|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Release|x64.Build.0 = Release|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Release|x86.ActiveCfg = Release|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Release|x86.Build.0 = Release|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Debug|x64.Build.0 = Debug|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Debug|x86.Build.0 = Debug|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Release|arm.ActiveCfg = Release|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Release|x64.ActiveCfg = Release|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Release|x64.Build.0 = Release|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Release|x86.ActiveCfg = Release|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Release|x86.Build.0 = Release|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E7D92072-71A6-47A2-90C0-75CBA3672693}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{661E0A3D-E151-45B2-AA38-B30F8227A741} = {8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50}
-		{5D40069E-7CC2-4B40-A41D-6B003CCB4075} = {8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50}
+		{661E0A3D-E151-45B2-AA38-B30F8227A741} = {908620B9-2483-46A3-A93E-78ECB5417BAF}
 		{869B6F76-2329-474A-854E-5AD5541A1CA0} = {654344FB-C5C8-4364-B43B-C2C9530B96F8}
 		{E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2} = {654344FB-C5C8-4364-B43B-C2C9530B96F8}
 		{6DF455E8-D2C8-40EC-AEF2-AE05A66405F7} = {654344FB-C5C8-4364-B43B-C2C9530B96F8}
 		{B6734AD0-410E-4B0F-B767-D586E92D4D56} = {4599348B-0480-47D4-9763-F3C6716D3CCC}
 		{9D308994-9721-4883-B32D-531FA8D9025B} = {4599348B-0480-47D4-9763-F3C6716D3CCC}
 		{04E09F3E-1897-43EE-94D3-786B679CB741} = {4599348B-0480-47D4-9763-F3C6716D3CCC}
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075} = {8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50}
+		{935F95BD-C858-4E4D-8C48-057B9F9A6FD1} = {6165604E-507C-41D7-AE23-C2CE4E64F685}
+		{CF805175-A3E1-4EB4-8C1A-525C0CF517F5} = {6165604E-507C-41D7-AE23-C2CE4E64F685}
+		{6165604E-507C-41D7-AE23-C2CE4E64F685} = {72BF7E3E-3778-4D65-8362-F301090B8B02}
+		{CF83A04B-AB5B-4C78-AAEB-7BE37A8896C4} = {CD5918A8-A5E7-4B14-AF36-015CE2D6EB2D}
+		{EE772DCC-A0E6-4C93-A91A-CB371BC6D9F4} = {CD5918A8-A5E7-4B14-AF36-015CE2D6EB2D}
+		{CD5918A8-A5E7-4B14-AF36-015CE2D6EB2D} = {72BF7E3E-3778-4D65-8362-F301090B8B02}
+		{E7D92072-71A6-47A2-90C0-75CBA3672693} = {4D27F9A8-F756-4850-A220-2CCA3DA1C45D}
+		{4D27F9A8-F756-4850-A220-2CCA3DA1C45D} = {72BF7E3E-3778-4D65-8362-F301090B8B02}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C218B18C-E001-417C-A347-A06C0D5DD6AB}
diff --git a/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln b/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
index d24972e9e5b9b..4f090542c594d 100644
--- a/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
+++ b/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
@@ -19,7 +19,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{35509CE1-7BCA-4390-8F9E-56997A2AD9AB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3A79F8E8-9E66-44C6-94E7-DE8C24F80E59}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{D61ED890-B208-4564-B77F-8C953E797502}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{1BF79BB9-37CE-4B5C-B16B-620B71947985}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{B6879798-B55A-480B-950E-08B74CCF2020}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{E9711A78-8BF9-4898-AB8B-4A910F636DFA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{983D609F-487D-4B85-9757-6AD4E7AAA312}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9BB99B5C-97D7-4247-B682-27CBBFCF1BB4}"
 EndProject
@@ -27,6 +37,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{89B14D9D-2BB
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B05E90C8-0282-4D7D-955E-3BE8A400D3A6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3A79F8E8-9E66-44C6-94E7-DE8C24F80E59}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{F5608419-456B-4AD8-B4BA-1465B70080E8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{C573542D-035B-4E60-BE4E-AEFD5FEF9C3D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{3C3397B4-58A1-441A-B1A7-060C9B1E2013}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0AFB8AA2-7483-4E63-A8A0-7CFE2906D253}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -265,13 +285,117 @@ Global
 		{35509CE1-7BCA-4390-8F9E-56997A2AD9AB}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{35509CE1-7BCA-4390-8F9E-56997A2AD9AB}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{35509CE1-7BCA-4390-8F9E-56997A2AD9AB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Debug|x64.Build.0 = Debug|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Debug|x86.Build.0 = Debug|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Release|arm.ActiveCfg = Release|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Release|arm64.ActiveCfg = Release|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Release|x64.ActiveCfg = Release|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Release|x64.Build.0 = Release|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Release|x86.ActiveCfg = Release|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Release|x86.Build.0 = Release|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Debug|x64.Build.0 = Debug|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Debug|x86.Build.0 = Debug|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Release|arm.ActiveCfg = Release|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Release|x64.ActiveCfg = Release|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Release|x64.Build.0 = Release|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Release|x86.ActiveCfg = Release|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Release|x86.Build.0 = Release|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D61ED890-B208-4564-B77F-8C953E797502}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Debug|x64.Build.0 = Debug|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Debug|x86.Build.0 = Debug|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Release|arm.ActiveCfg = Release|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Release|x64.ActiveCfg = Release|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Release|x64.Build.0 = Release|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Release|x86.ActiveCfg = Release|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Release|x86.Build.0 = Release|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Debug|x64.Build.0 = Debug|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Debug|x86.Build.0 = Debug|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Release|arm.ActiveCfg = Release|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Release|x64.ActiveCfg = Release|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Release|x64.Build.0 = Release|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Release|x86.ActiveCfg = Release|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Release|x86.Build.0 = Release|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B6879798-B55A-480B-950E-08B74CCF2020}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Debug|x64.Build.0 = Debug|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Debug|x86.Build.0 = Debug|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Release|arm.ActiveCfg = Release|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Release|x64.ActiveCfg = Release|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Release|x64.Build.0 = Release|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Release|x86.ActiveCfg = Release|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Release|x86.Build.0 = Release|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{F3F9D019-086A-4093-BD49-11B6B204D94A} = {3A79F8E8-9E66-44C6-94E7-DE8C24F80E59}
-		{B958EACD-B145-4B48-A11B-C5E5B565E311} = {3A79F8E8-9E66-44C6-94E7-DE8C24F80E59}
+		{F3F9D019-086A-4093-BD49-11B6B204D94A} = {983D609F-487D-4B85-9757-6AD4E7AAA312}
 		{41438432-4DC0-4724-8C8F-0D100083490F} = {9BB99B5C-97D7-4247-B682-27CBBFCF1BB4}
 		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750} = {9BB99B5C-97D7-4247-B682-27CBBFCF1BB4}
 		{EAE41D82-CFFA-4934-89B2-399D12530E84} = {89B14D9D-2BBE-446A-8ED8-020F7BBA6CFC}
@@ -280,6 +404,15 @@ Global
 		{919F14ED-E86A-4757-BFEB-8AEEDBCB09E4} = {B05E90C8-0282-4D7D-955E-3BE8A400D3A6}
 		{03C0F6B8-A04B-4822-8089-3918F02AD281} = {B05E90C8-0282-4D7D-955E-3BE8A400D3A6}
 		{35509CE1-7BCA-4390-8F9E-56997A2AD9AB} = {B05E90C8-0282-4D7D-955E-3BE8A400D3A6}
+		{B958EACD-B145-4B48-A11B-C5E5B565E311} = {3A79F8E8-9E66-44C6-94E7-DE8C24F80E59}
+		{166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2} = {F5608419-456B-4AD8-B4BA-1465B70080E8}
+		{D61ED890-B208-4564-B77F-8C953E797502} = {F5608419-456B-4AD8-B4BA-1465B70080E8}
+		{F5608419-456B-4AD8-B4BA-1465B70080E8} = {0AFB8AA2-7483-4E63-A8A0-7CFE2906D253}
+		{1BF79BB9-37CE-4B5C-B16B-620B71947985} = {C573542D-035B-4E60-BE4E-AEFD5FEF9C3D}
+		{B6879798-B55A-480B-950E-08B74CCF2020} = {C573542D-035B-4E60-BE4E-AEFD5FEF9C3D}
+		{C573542D-035B-4E60-BE4E-AEFD5FEF9C3D} = {0AFB8AA2-7483-4E63-A8A0-7CFE2906D253}
+		{E9711A78-8BF9-4898-AB8B-4A910F636DFA} = {3C3397B4-58A1-441A-B1A7-060C9B1E2013}
+		{3C3397B4-58A1-441A-B1A7-060C9B1E2013} = {0AFB8AA2-7483-4E63-A8A0-7CFE2906D253}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4A98215D-6F1A-4A70-B579-89B7EF7FC92A}
diff --git a/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln b/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln
index 6b72b97b8bbea..40d0d38533bcc 100644
--- a/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln
+++ b/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln
@@ -1,86 +1,538 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{78128772-D609-4144-8654-6D8403DEF0C9}"
+EndProject
 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.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{42F8E509-4629-4FE6-8E55-02E272D0209E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{C5F4AA26-CCDF-474B-911F-8204E69FC622}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{8BEA8A00-B086-45A7-B21A-0E58A1542D06}"
+EndProject
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{C9A138C9-DFBA-4034-867B-CA68368F84A5}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{7D904627-2671-4790-81DB-FA1FDA20CE83}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{E6F71289-D9DC-439E-9093-9ECA2E533564}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{51182FA9-71D8-48D4-8461-63A04EDFDF77}"
 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", "{2195CD2B-EF9E-46A7-B4AA-A2CD31625957}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F5B0A1AE-8B97-4B49-B5C8-8E63C6FAAED3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{79A2178B-D3D2-4E1A-94E7-4856FFC23287}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{BB492CB7-6474-4A4B-880A-E4ABC60E0718}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{02C30DE1-6A8F-402C-B137-EDEFBF1AE807}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2195CD2B-EF9E-46A7-B4AA-A2CD31625957}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CF5D1CDD-1A13-475D-BD12-13202A620D8A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6DCAB55C-A3EE-46AB-94C0-57DBE27E2A22}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F5B0A1AE-8B97-4B49-B5C8-8E63C6FAAED3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CB23059A-3642-4B70-84F3-5D5BD57E0561}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{BE197124-901B-4517-879B-93D0E6684A2C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{DB598308-6179-48EA-A670-0DA6CE5D8340}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{7FF9B3DF-E383-4487-9ADB-E3BF59CFCE83}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm = Debug|arm
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm = Release|arm
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Debug|Any CPU.Build.0 = Debug|x64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Debug|arm.ActiveCfg = Debug|arm
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Debug|arm.Build.0 = Debug|arm
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Debug|arm64.ActiveCfg = Debug|arm64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Debug|arm64.Build.0 = Debug|arm64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Debug|x64.ActiveCfg = Debug|x64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Debug|x64.Build.0 = Debug|x64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Debug|x86.ActiveCfg = Debug|x86
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Debug|x86.Build.0 = Debug|x86
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Release|Any CPU.ActiveCfg = Release|x64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Release|Any CPU.Build.0 = Release|x64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Release|arm.ActiveCfg = Release|arm
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Release|arm.Build.0 = Release|arm
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Release|arm64.ActiveCfg = Release|arm64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Release|arm64.Build.0 = Release|arm64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Release|x64.ActiveCfg = Release|x64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Release|x64.Build.0 = Release|x64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Release|x86.ActiveCfg = Release|x86
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Release|x86.Build.0 = Release|x86
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Checked|Any CPU.Build.0 = Checked|x64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Checked|arm.ActiveCfg = Checked|arm
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Checked|arm.Build.0 = Checked|arm
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Checked|arm64.ActiveCfg = Checked|arm64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Checked|arm64.Build.0 = Checked|arm64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Checked|x64.ActiveCfg = Checked|x64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Checked|x64.Build.0 = Checked|x64
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Checked|x86.ActiveCfg = Checked|x86
+		{78128772-D609-4144-8654-6D8403DEF0C9}.Checked|x86.Build.0 = Checked|x86
 		{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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Debug|x64.Build.0 = Debug|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Debug|x86.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
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Release|arm.ActiveCfg = Release|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Release|x64.ActiveCfg = Release|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Release|x64.Build.0 = Release|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Release|x86.ActiveCfg = Release|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Release|x86.Build.0 = Release|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Debug|x64.Build.0 = Debug|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Debug|x86.Build.0 = Debug|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Release|arm.ActiveCfg = Release|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Release|x64.ActiveCfg = Release|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Release|x64.Build.0 = Release|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Release|x86.ActiveCfg = Release|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Release|x86.Build.0 = Release|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{42F8E509-4629-4FE6-8E55-02E272D0209E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Debug|x64.Build.0 = Debug|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Debug|x86.Build.0 = Debug|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Release|arm.ActiveCfg = Release|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Release|x64.ActiveCfg = Release|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Release|x64.Build.0 = Release|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Release|x86.ActiveCfg = Release|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Release|x86.Build.0 = Release|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Debug|x64.Build.0 = Debug|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Debug|x86.Build.0 = Debug|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Release|arm.ActiveCfg = Release|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Release|x64.ActiveCfg = Release|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Release|x64.Build.0 = Release|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Release|x86.ActiveCfg = Release|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Release|x86.Build.0 = Release|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Debug|x64.Build.0 = Debug|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Debug|x86.Build.0 = Debug|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Release|arm.ActiveCfg = Release|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Release|x64.ActiveCfg = Release|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Release|x64.Build.0 = Release|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Release|x86.ActiveCfg = Release|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Release|x86.Build.0 = Release|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Debug|x64.Build.0 = Debug|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Debug|x86.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
+		{464BD919-594A-4662-B061-D028CB8F3556}.Release|arm.ActiveCfg = Release|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Release|arm64.ActiveCfg = Release|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Release|x64.ActiveCfg = Release|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Release|x64.Build.0 = Release|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Release|x86.ActiveCfg = Release|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Release|x86.Build.0 = Release|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Debug|x64.Build.0 = Debug|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Debug|x86.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
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Release|arm.ActiveCfg = Release|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Release|x64.ActiveCfg = Release|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Release|x64.Build.0 = Release|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Release|x86.ActiveCfg = Release|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Release|x86.Build.0 = Release|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Debug|x64.Build.0 = Debug|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Debug|x86.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
-		{C9A138C9-DFBA-4034-867B-CA68368F84A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9A138C9-DFBA-4034-867B-CA68368F84A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C9A138C9-DFBA-4034-867B-CA68368F84A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C9A138C9-DFBA-4034-867B-CA68368F84A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Release|arm.ActiveCfg = Release|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Release|x64.ActiveCfg = Release|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Release|x64.Build.0 = Release|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Release|x86.ActiveCfg = Release|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Release|x86.Build.0 = Release|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Debug|x64.Build.0 = Debug|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Debug|x86.Build.0 = Debug|Any CPU
 		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Release|arm.ActiveCfg = Release|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Release|x64.ActiveCfg = Release|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Release|x64.Build.0 = Release|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Release|x86.ActiveCfg = Release|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Release|x86.Build.0 = Release|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Debug|x64.Build.0 = Debug|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Debug|x86.Build.0 = Debug|Any CPU
 		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Release|arm.ActiveCfg = Release|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Release|x64.ActiveCfg = Release|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Release|x64.Build.0 = Release|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Release|x86.ActiveCfg = Release|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Release|x86.Build.0 = Release|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Debug|x64.Build.0 = Debug|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Debug|x86.Build.0 = Debug|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Release|arm.ActiveCfg = Release|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Release|x64.ActiveCfg = Release|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Release|x64.Build.0 = Release|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Release|x86.ActiveCfg = Release|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Release|x86.Build.0 = Release|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7D904627-2671-4790-81DB-FA1FDA20CE83}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Debug|x64.Build.0 = Debug|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Debug|x86.Build.0 = Debug|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Release|arm.ActiveCfg = Release|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Release|x64.ActiveCfg = Release|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Release|x64.Build.0 = Release|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Release|x86.ActiveCfg = Release|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Release|x86.Build.0 = Release|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E6F71289-D9DC-439E-9093-9ECA2E533564}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Debug|x64.Build.0 = Debug|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Debug|x86.Build.0 = Debug|Any CPU
 		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Release|arm.ActiveCfg = Release|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Release|arm64.ActiveCfg = Release|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Release|x64.ActiveCfg = Release|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Release|x64.Build.0 = Release|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Release|x86.ActiveCfg = Release|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Release|x86.Build.0 = Release|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Debug|x64.Build.0 = Debug|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Debug|x86.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
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Release|arm.ActiveCfg = Release|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Release|arm64.ActiveCfg = Release|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Release|x64.ActiveCfg = Release|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Release|x64.Build.0 = Release|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Release|x86.ActiveCfg = Release|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Release|x86.Build.0 = Release|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Debug|x64.Build.0 = Debug|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Debug|x86.Build.0 = Debug|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Release|arm.ActiveCfg = Release|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Release|x64.ActiveCfg = Release|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Release|x64.Build.0 = Release|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Release|x86.ActiveCfg = Release|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Release|x86.Build.0 = Release|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Debug|x64.Build.0 = Debug|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Debug|x86.Build.0 = Debug|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Release|arm.ActiveCfg = Release|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Release|arm64.ActiveCfg = Release|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Release|x64.ActiveCfg = Release|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Release|x64.Build.0 = Release|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Release|x86.ActiveCfg = Release|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Release|x86.Build.0 = Release|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Debug|x64.Build.0 = Debug|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Debug|x86.Build.0 = Debug|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Release|arm.ActiveCfg = Release|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Release|x64.ActiveCfg = Release|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Release|x64.Build.0 = Release|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Release|x86.ActiveCfg = Release|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Release|x86.Build.0 = Release|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Debug|x64.Build.0 = Debug|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Debug|x86.Build.0 = Debug|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Release|arm.ActiveCfg = Release|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Release|arm64.ActiveCfg = Release|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Release|x64.ActiveCfg = Release|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Release|x64.Build.0 = Release|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Release|x86.ActiveCfg = Release|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Release|x86.Build.0 = Release|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Debug|x64.Build.0 = Debug|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Debug|x86.Build.0 = Debug|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Release|arm.ActiveCfg = Release|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Release|x64.ActiveCfg = Release|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Release|x64.Build.0 = Release|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Release|x86.ActiveCfg = Release|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Release|x86.Build.0 = Release|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{78128772-D609-4144-8654-6D8403DEF0C9} = {02C30DE1-6A8F-402C-B137-EDEFBF1AE807}
 		{174DC291-4C4A-41D0-B351-8054872AB46A} = {2195CD2B-EF9E-46A7-B4AA-A2CD31625957}
 		{F4A98D66-BA15-4C42-94A9-4732965A969A} = {2195CD2B-EF9E-46A7-B4AA-A2CD31625957}
-		{464BD919-594A-4662-B061-D028CB8F3556} = {F5B0A1AE-8B97-4B49-B5C8-8E63C6FAAED3}
-		{51182FA9-71D8-48D4-8461-63A04EDFDF77} = {F5B0A1AE-8B97-4B49-B5C8-8E63C6FAAED3}
+		{42F8E509-4629-4FE6-8E55-02E272D0209E} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A}
+		{8BEA8A00-B086-45A7-B21A-0E58A1542D06} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A}
 		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A}
+		{E6F71289-D9DC-439E-9093-9ECA2E533564} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A}
 		{0174A61A-7E2B-47FC-9CB7-E9EABB898820} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A}
-		{C9A138C9-DFBA-4034-867B-CA68368F84A5} = {6DCAB55C-A3EE-46AB-94C0-57DBE27E2A22}
+		{C5F4AA26-CCDF-474B-911F-8204E69FC622} = {6DCAB55C-A3EE-46AB-94C0-57DBE27E2A22}
 		{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872} = {6DCAB55C-A3EE-46AB-94C0-57DBE27E2A22}
 		{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84} = {6DCAB55C-A3EE-46AB-94C0-57DBE27E2A22}
+		{2620A6B7-AC32-4B19-A933-30AC1EBE8BFC} = {F5B0A1AE-8B97-4B49-B5C8-8E63C6FAAED3}
+		{464BD919-594A-4662-B061-D028CB8F3556} = {F5B0A1AE-8B97-4B49-B5C8-8E63C6FAAED3}
+		{7D904627-2671-4790-81DB-FA1FDA20CE83} = {F5B0A1AE-8B97-4B49-B5C8-8E63C6FAAED3}
+		{51182FA9-71D8-48D4-8461-63A04EDFDF77} = {F5B0A1AE-8B97-4B49-B5C8-8E63C6FAAED3}
+		{9CA5EAB9-D6EA-428D-A7C9-9E5901293123} = {CB23059A-3642-4B70-84F3-5D5BD57E0561}
+		{79A2178B-D3D2-4E1A-94E7-4856FFC23287} = {CB23059A-3642-4B70-84F3-5D5BD57E0561}
+		{CB23059A-3642-4B70-84F3-5D5BD57E0561} = {7FF9B3DF-E383-4487-9ADB-E3BF59CFCE83}
+		{09E789AC-BEF7-48C9-8461-0D8C8E17E31F} = {BE197124-901B-4517-879B-93D0E6684A2C}
+		{BB492CB7-6474-4A4B-880A-E4ABC60E0718} = {BE197124-901B-4517-879B-93D0E6684A2C}
+		{BE197124-901B-4517-879B-93D0E6684A2C} = {7FF9B3DF-E383-4487-9ADB-E3BF59CFCE83}
+		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC} = {DB598308-6179-48EA-A670-0DA6CE5D8340}
+		{DB598308-6179-48EA-A670-0DA6CE5D8340} = {7FF9B3DF-E383-4487-9ADB-E3BF59CFCE83}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E201426B-999F-48A5-BCFD-3E757AA0E182}
diff --git a/src/libraries/System.Resources.Writer/System.Resources.Writer.sln b/src/libraries/System.Resources.Writer/System.Resources.Writer.sln
index b319e7987a9e3..696d00e0d5857 100644
--- a/src/libraries/System.Resources.Writer/System.Resources.Writer.sln
+++ b/src/libraries/System.Resources.Writer/System.Resources.Writer.sln
@@ -13,6 +13,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{45BE69F2-B543-4056-AF6C-6A711949A7FA}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{F3E0DF20-021F-420C-BB37-D0DDC5BBC58A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{B2EE67CB-0282-4C1D-8EFE-F09897906C83}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{30717787-C0F6-44EB-8641-3B4DE34632FF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{4E445087-0002-4D0B-AE42-DBC80B7E2F87}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{45F5742D-D961-48B0-8899-6CA5A75E249F}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{112C54A1-881D-4EE7-A279-DC719E667CFF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{36F1D0ED-0960-4B7E-832F-F2A304803FC3}"
@@ -21,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E6EE9961-9C9
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{AB6CB51B-36BD-4444-BB33-86DADD78045C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{5A32D0DE-B833-4139-86DD-EA6B71B3AEED}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{DF43DAC0-6BBF-4CEA-A07C-AA8798B8FA94}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{6A17AA93-018D-4103-8C59-E71D238EAA48}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{8BB9FEEB-1F0D-44CA-AB68-640CDFE8AD9B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +73,26 @@ Global
 		{45BE69F2-B543-4056-AF6C-6A711949A7FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{45BE69F2-B543-4056-AF6C-6A711949A7FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{45BE69F2-B543-4056-AF6C-6A711949A7FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3E0DF20-021F-420C-BB37-D0DDC5BBC58A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3E0DF20-021F-420C-BB37-D0DDC5BBC58A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3E0DF20-021F-420C-BB37-D0DDC5BBC58A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3E0DF20-021F-420C-BB37-D0DDC5BBC58A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2EE67CB-0282-4C1D-8EFE-F09897906C83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2EE67CB-0282-4C1D-8EFE-F09897906C83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2EE67CB-0282-4C1D-8EFE-F09897906C83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2EE67CB-0282-4C1D-8EFE-F09897906C83}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30717787-C0F6-44EB-8641-3B4DE34632FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30717787-C0F6-44EB-8641-3B4DE34632FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30717787-C0F6-44EB-8641-3B4DE34632FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30717787-C0F6-44EB-8641-3B4DE34632FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E445087-0002-4D0B-AE42-DBC80B7E2F87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E445087-0002-4D0B-AE42-DBC80B7E2F87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E445087-0002-4D0B-AE42-DBC80B7E2F87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E445087-0002-4D0B-AE42-DBC80B7E2F87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45F5742D-D961-48B0-8899-6CA5A75E249F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45F5742D-D961-48B0-8899-6CA5A75E249F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45F5742D-D961-48B0-8899-6CA5A75E249F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45F5742D-D961-48B0-8899-6CA5A75E249F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -67,6 +105,14 @@ Global
 		{1C001837-6F9D-4C5A-94B4-4388225C34B5} = {E6EE9961-9C9A-4935-8AE2-18316677F47F}
 		{5596D7DF-5577-4349-A688-0B014626A7E4} = {AB6CB51B-36BD-4444-BB33-86DADD78045C}
 		{4EA24626-EACB-49F0-92EC-89502E566053} = {AB6CB51B-36BD-4444-BB33-86DADD78045C}
+		{F3E0DF20-021F-420C-BB37-D0DDC5BBC58A} = {5A32D0DE-B833-4139-86DD-EA6B71B3AEED}
+		{B2EE67CB-0282-4C1D-8EFE-F09897906C83} = {5A32D0DE-B833-4139-86DD-EA6B71B3AEED}
+		{5A32D0DE-B833-4139-86DD-EA6B71B3AEED} = {8BB9FEEB-1F0D-44CA-AB68-640CDFE8AD9B}
+		{30717787-C0F6-44EB-8641-3B4DE34632FF} = {DF43DAC0-6BBF-4CEA-A07C-AA8798B8FA94}
+		{4E445087-0002-4D0B-AE42-DBC80B7E2F87} = {DF43DAC0-6BBF-4CEA-A07C-AA8798B8FA94}
+		{DF43DAC0-6BBF-4CEA-A07C-AA8798B8FA94} = {8BB9FEEB-1F0D-44CA-AB68-640CDFE8AD9B}
+		{45F5742D-D961-48B0-8899-6CA5A75E249F} = {6A17AA93-018D-4103-8C59-E71D238EAA48}
+		{6A17AA93-018D-4103-8C59-E71D238EAA48} = {8BB9FEEB-1F0D-44CA-AB68-640CDFE8AD9B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C1D84753-65B5-4B60-A555-3507CD4FDAB2}
diff --git a/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln b/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln
index 5c75bc24e992b..436ee74a19e20 100644
--- a/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln
+++ b/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln
@@ -1,6 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{537CECFF-20AE-4AD4-A433-C1753A88E4E8}"
+EndProject
 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.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{6DBEA1D1-448D-4C27-B329-19F4F214E536}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\ref\System.Configuration.ConfigurationManager.csproj", "{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj", "{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}"
@@ -11,18 +15,26 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\src\System.Diagnostics.EventLog.csproj", "{57970B50-FB9F-40A5-9073-A7A48A473682}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{2F5E19AA-B790-403E-860E-2569CC1ADF02}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{A4864A61-7A24-4FE6-9C55-76A645D41BCE}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Caching", "ref\System.Runtime.Caching.csproj", "{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}"
 EndProject
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{3C11A5D8-BCFD-465D-93F2-100CF6382A17}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{B76EE305-CA7C-494C-8374-ABD93081F6AE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{447797DB-DF70-4568-A323-F88A45A91026}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{CC3E8A04-504D-438A-B332-C27DD7783A33}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{2D833530-E133-4ACF-9C1C-12A9623DEE56}"
+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}"
@@ -35,115 +47,708 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{28BE2B3F-890C-45EF-B90A-9FA92302365E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C315269F-EEA6-4F74-BA10-65ECAA6351C8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{4CD58207-3CDE-4C05-978E-FE75F544B2C5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{5A99AE6A-15BE-4F29-BDC3-C1868750F891}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{88BF890E-ED98-4505-8710-F9FB3DE5CE64}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{31DE693C-394A-461E-918B-2F3FEC37FBCC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{28BE2B3F-890C-45EF-B90A-9FA92302365E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C315269F-EEA6-4F74-BA10-65ECAA6351C8}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5E28270B-1EEB-4D0E-9A3C-6959BEA9647E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{191AA172-B1CF-40FE-8B10-707FF5A6684F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{5C5F1A98-51A5-4FDF-A61A-179A5D37E03D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{A04A3FBF-112F-4D5B-84B1-886DD1D8086A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{A278FE36-D732-4708-978F-C47FEC428E1D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm = Debug|arm
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm = Release|arm
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Debug|Any CPU.Build.0 = Debug|x64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Debug|arm.ActiveCfg = Debug|arm
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Debug|arm.Build.0 = Debug|arm
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Debug|arm64.ActiveCfg = Debug|arm64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Debug|arm64.Build.0 = Debug|arm64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Debug|x64.ActiveCfg = Debug|x64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Debug|x64.Build.0 = Debug|x64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Debug|x86.ActiveCfg = Debug|x86
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Debug|x86.Build.0 = Debug|x86
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Release|Any CPU.ActiveCfg = Release|x64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Release|Any CPU.Build.0 = Release|x64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Release|arm.ActiveCfg = Release|arm
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Release|arm.Build.0 = Release|arm
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Release|arm64.ActiveCfg = Release|arm64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Release|arm64.Build.0 = Release|arm64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Release|x64.ActiveCfg = Release|x64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Release|x64.Build.0 = Release|x64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Release|x86.ActiveCfg = Release|x86
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Release|x86.Build.0 = Release|x86
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Checked|Any CPU.Build.0 = Checked|x64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Checked|arm.ActiveCfg = Checked|arm
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Checked|arm.Build.0 = Checked|arm
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Checked|arm64.ActiveCfg = Checked|arm64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Checked|arm64.Build.0 = Checked|arm64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Checked|x64.ActiveCfg = Checked|x64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Checked|x64.Build.0 = Checked|x64
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Checked|x86.ActiveCfg = Checked|x86
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8}.Checked|x86.Build.0 = Checked|x86
 		{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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Debug|x64.Build.0 = Debug|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Debug|x86.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
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Release|arm.ActiveCfg = Release|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Release|x64.ActiveCfg = Release|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Release|x64.Build.0 = Release|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Release|x86.ActiveCfg = Release|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Release|x86.Build.0 = Release|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Debug|x64.Build.0 = Debug|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Debug|x86.Build.0 = Debug|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Release|arm.ActiveCfg = Release|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Release|x64.ActiveCfg = Release|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Release|x64.Build.0 = Release|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Release|x86.ActiveCfg = Release|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Release|x86.Build.0 = Release|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Debug|x64.Build.0 = Debug|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Debug|x86.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
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Release|arm.ActiveCfg = Release|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Release|x64.ActiveCfg = Release|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Release|x64.Build.0 = Release|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Release|x86.ActiveCfg = Release|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Release|x86.Build.0 = Release|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Debug|x64.Build.0 = Debug|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Debug|x86.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
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Release|arm.ActiveCfg = Release|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Release|x64.ActiveCfg = Release|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Release|x64.Build.0 = Release|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Release|x86.ActiveCfg = Release|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Release|x86.Build.0 = Release|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Debug|x64.Build.0 = Debug|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Debug|x86.Build.0 = Debug|Any CPU
 		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Release|arm.ActiveCfg = Release|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Release|x64.ActiveCfg = Release|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Release|x64.Build.0 = Release|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Release|x86.ActiveCfg = Release|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Release|x86.Build.0 = Release|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Debug|x64.Build.0 = Debug|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Debug|x86.Build.0 = Debug|Any CPU
 		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Release|arm.ActiveCfg = Release|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Release|x64.ActiveCfg = Release|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Release|x64.Build.0 = Release|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Release|x86.ActiveCfg = Release|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Release|x86.Build.0 = Release|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{57970B50-FB9F-40A5-9073-A7A48A473682}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{57970B50-FB9F-40A5-9073-A7A48A473682}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Debug|x64.Build.0 = Debug|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Debug|x86.Build.0 = Debug|Any CPU
 		{57970B50-FB9F-40A5-9073-A7A48A473682}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57970B50-FB9F-40A5-9073-A7A48A473682}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Release|arm.ActiveCfg = Release|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Release|arm64.ActiveCfg = Release|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Release|x64.ActiveCfg = Release|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Release|x64.Build.0 = Release|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Release|x86.ActiveCfg = Release|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Release|x86.Build.0 = Release|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{57970B50-FB9F-40A5-9073-A7A48A473682}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Debug|x64.Build.0 = Debug|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Debug|x86.Build.0 = Debug|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Release|arm.ActiveCfg = Release|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Release|x64.ActiveCfg = Release|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Release|x64.Build.0 = Release|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Release|x86.ActiveCfg = Release|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Release|x86.Build.0 = Release|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Debug|x64.Build.0 = Debug|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Debug|x86.Build.0 = Debug|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Release|arm.ActiveCfg = Release|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Release|x64.ActiveCfg = Release|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Release|x64.Build.0 = Release|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Release|x86.ActiveCfg = Release|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Release|x86.Build.0 = Release|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Debug|x64.Build.0 = Debug|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Debug|x86.Build.0 = Debug|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Release|arm.ActiveCfg = Release|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Release|x64.ActiveCfg = Release|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Release|x64.Build.0 = Release|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Release|x86.ActiveCfg = Release|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Release|x86.Build.0 = Release|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Debug|x64.Build.0 = Debug|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Debug|x86.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
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Release|arm.ActiveCfg = Release|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Release|x64.ActiveCfg = Release|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Release|x64.Build.0 = Release|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Release|x86.ActiveCfg = Release|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Release|x86.Build.0 = Release|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Debug|x64.Build.0 = Debug|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Debug|x86.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
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Release|arm.ActiveCfg = Release|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Release|x64.ActiveCfg = Release|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Release|x64.Build.0 = Release|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Release|x86.ActiveCfg = Release|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Release|x86.Build.0 = Release|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Debug|x64.Build.0 = Debug|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Debug|x86.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
-		{3C11A5D8-BCFD-465D-93F2-100CF6382A17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C11A5D8-BCFD-465D-93F2-100CF6382A17}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C11A5D8-BCFD-465D-93F2-100CF6382A17}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C11A5D8-BCFD-465D-93F2-100CF6382A17}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Release|arm.ActiveCfg = Release|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Release|x64.ActiveCfg = Release|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Release|x64.Build.0 = Release|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Release|x86.ActiveCfg = Release|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Release|x86.Build.0 = Release|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Debug|x64.Build.0 = Debug|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Debug|x86.Build.0 = Debug|Any CPU
 		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Release|arm.ActiveCfg = Release|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Release|x64.ActiveCfg = Release|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Release|x64.Build.0 = Release|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Release|x86.ActiveCfg = Release|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Release|x86.Build.0 = Release|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B76EE305-CA7C-494C-8374-ABD93081F6AE}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{447797DB-DF70-4568-A323-F88A45A91026}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{447797DB-DF70-4568-A323-F88A45A91026}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Debug|x64.Build.0 = Debug|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Debug|x86.Build.0 = Debug|Any CPU
 		{447797DB-DF70-4568-A323-F88A45A91026}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{447797DB-DF70-4568-A323-F88A45A91026}.Release|Any CPU.Build.0 = Release|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Release|arm.ActiveCfg = Release|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Release|arm64.ActiveCfg = Release|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Release|x64.ActiveCfg = Release|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Release|x64.Build.0 = Release|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Release|x86.ActiveCfg = Release|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Release|x86.Build.0 = Release|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{447797DB-DF70-4568-A323-F88A45A91026}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Debug|x64.Build.0 = Debug|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Debug|x86.Build.0 = Debug|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Release|arm.ActiveCfg = Release|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Release|x64.ActiveCfg = Release|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Release|x64.Build.0 = Release|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Release|x86.ActiveCfg = Release|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Release|x86.Build.0 = Release|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CC3E8A04-504D-438A-B332-C27DD7783A33}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Debug|x64.Build.0 = Debug|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Debug|x86.Build.0 = Debug|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Release|arm.ActiveCfg = Release|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Release|x64.ActiveCfg = Release|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Release|x64.Build.0 = Release|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Release|x86.ActiveCfg = Release|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Release|x86.Build.0 = Release|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Debug|x64.Build.0 = Debug|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Debug|x86.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
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Release|arm.ActiveCfg = Release|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Release|x64.ActiveCfg = Release|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Release|x64.Build.0 = Release|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Release|x86.ActiveCfg = Release|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Release|x86.Build.0 = Release|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Debug|x64.Build.0 = Debug|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Debug|x86.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
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Release|arm.ActiveCfg = Release|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Release|x64.ActiveCfg = Release|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Release|x64.Build.0 = Release|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Release|x86.ActiveCfg = Release|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Release|x86.Build.0 = Release|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Debug|x64.Build.0 = Debug|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Debug|x86.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
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Release|arm.ActiveCfg = Release|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Release|arm64.ActiveCfg = Release|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Release|x64.ActiveCfg = Release|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Release|x64.Build.0 = Release|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Release|x86.ActiveCfg = Release|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Release|x86.Build.0 = Release|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Debug|x64.Build.0 = Debug|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Debug|x86.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
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Release|arm.ActiveCfg = Release|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Release|x64.ActiveCfg = Release|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Release|x64.Build.0 = Release|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Release|x86.ActiveCfg = Release|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Release|x86.Build.0 = Release|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Debug|x64.Build.0 = Debug|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Debug|x86.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
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Release|arm.ActiveCfg = Release|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Release|x64.ActiveCfg = Release|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Release|x64.Build.0 = Release|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Release|x86.ActiveCfg = Release|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Release|x86.Build.0 = Release|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Debug|x64.Build.0 = Debug|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Debug|x86.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
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Release|arm.ActiveCfg = Release|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Release|arm64.ActiveCfg = Release|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Release|x64.ActiveCfg = Release|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Release|x64.Build.0 = Release|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Release|x86.ActiveCfg = Release|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Release|x86.Build.0 = Release|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Debug|x64.Build.0 = Debug|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Debug|x86.Build.0 = Debug|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Release|arm.ActiveCfg = Release|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Release|arm64.ActiveCfg = Release|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Release|x64.ActiveCfg = Release|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Release|x64.Build.0 = Release|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Release|x86.ActiveCfg = Release|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Release|x86.Build.0 = Release|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Debug|x64.Build.0 = Debug|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Debug|x86.Build.0 = Debug|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Release|arm.ActiveCfg = Release|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Release|arm64.ActiveCfg = Release|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Release|x64.ActiveCfg = Release|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Release|x64.Build.0 = Release|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Release|x86.ActiveCfg = Release|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Release|x86.Build.0 = Release|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Debug|x64.Build.0 = Debug|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Debug|x86.Build.0 = Debug|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Release|arm.ActiveCfg = Release|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Release|x64.ActiveCfg = Release|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Release|x64.Build.0 = Release|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Release|x86.ActiveCfg = Release|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Release|x86.Build.0 = Release|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Debug|x64.Build.0 = Debug|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Debug|x86.Build.0 = Debug|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Release|arm.ActiveCfg = Release|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Release|arm64.ActiveCfg = Release|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Release|x64.ActiveCfg = Release|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Release|x64.Build.0 = Release|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Release|x86.ActiveCfg = Release|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Release|x86.Build.0 = Release|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Debug|x64.Build.0 = Debug|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Debug|x86.Build.0 = Debug|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Release|arm.ActiveCfg = Release|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Release|arm64.ActiveCfg = Release|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Release|x64.ActiveCfg = Release|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Release|x64.Build.0 = Release|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Release|x86.ActiveCfg = Release|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Release|x86.Build.0 = Release|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{537CECFF-20AE-4AD4-A433-C1753A88E4E8} = {31DE693C-394A-461E-918B-2F3FEC37FBCC}
 		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748} = {28BE2B3F-890C-45EF-B90A-9FA92302365E}
 		{AA05074D-88AF-482E-A44A-F1AC13494E9F} = {28BE2B3F-890C-45EF-B90A-9FA92302365E}
-		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8}
-		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8}
-		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8}
-		{986272FB-E5C6-4881-9867-DC3427D883AE} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8}
-		{45E0A981-A131-4147-94E7-49AAC45F5D14} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8}
-		{A154C9F1-845A-4596-9061-92C462E971A6} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8}
+		{6DBEA1D1-448D-4C27-B329-19F4F214E536} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}
 		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}
 		{F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}
 		{57970B50-FB9F-40A5-9073-A7A48A473682} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}
+		{A4864A61-7A24-4FE6-9C55-76A645D41BCE} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}
 		{6311C025-F6D3-43A0-A9DA-A58AA6602568} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}
+		{2D833530-E133-4ACF-9C1C-12A9623DEE56} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}
 		{AFBFBBE6-F5EC-4889-9F34-03E07562630D} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}
 		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}
 		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}
-		{3C11A5D8-BCFD-465D-93F2-100CF6382A17} = {5E28270B-1EEB-4D0E-9A3C-6959BEA9647E}
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8}
+		{7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8}
+		{2F5E19AA-B790-403E-860E-2569CC1ADF02} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8}
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8}
+		{CC3E8A04-504D-438A-B332-C27DD7783A33} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8}
+		{986272FB-E5C6-4881-9867-DC3427D883AE} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8}
+		{45E0A981-A131-4147-94E7-49AAC45F5D14} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8}
+		{A154C9F1-845A-4596-9061-92C462E971A6} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8}
+		{7D95B81C-25A6-4E6A-88E9-A8BBE59538BE} = {5E28270B-1EEB-4D0E-9A3C-6959BEA9647E}
 		{B76EE305-CA7C-494C-8374-ABD93081F6AE} = {5E28270B-1EEB-4D0E-9A3C-6959BEA9647E}
 		{447797DB-DF70-4568-A323-F88A45A91026} = {5E28270B-1EEB-4D0E-9A3C-6959BEA9647E}
+		{EA4D9319-C5FB-4829-BB2F-E0FAA1DE79E3} = {191AA172-B1CF-40FE-8B10-707FF5A6684F}
+		{FDBA4009-E8BE-4E64-8121-FBA67E0B8455} = {191AA172-B1CF-40FE-8B10-707FF5A6684F}
+		{191AA172-B1CF-40FE-8B10-707FF5A6684F} = {A278FE36-D732-4708-978F-C47FEC428E1D}
+		{4CD58207-3CDE-4C05-978E-FE75F544B2C5} = {5C5F1A98-51A5-4FDF-A61A-179A5D37E03D}
+		{5A99AE6A-15BE-4F29-BDC3-C1868750F891} = {5C5F1A98-51A5-4FDF-A61A-179A5D37E03D}
+		{5C5F1A98-51A5-4FDF-A61A-179A5D37E03D} = {A278FE36-D732-4708-978F-C47FEC428E1D}
+		{88BF890E-ED98-4505-8710-F9FB3DE5CE64} = {A04A3FBF-112F-4D5B-84B1-886DD1D8086A}
+		{A04A3FBF-112F-4D5B-84B1-886DD1D8086A} = {A278FE36-D732-4708-978F-C47FEC428E1D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7B9B7D16-2C48-486A-B84B-6FF6D28509F6}
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 4401373e355a1..988d2c5b7dcf4 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
@@ -13,6 +13,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{A60F4450-369D-4DF2-8FC0-462518A81DB9}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{A30BAAF3-634E-4E4F-B313-8C3FC945D577}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{8AB4F59A-F763-4673-8B43-C2745E0A8135}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{3ED6BA8D-BFDC-4CFD-8AB8-D925E4F09E46}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{4D9C87A8-C288-428B-86D5-B09077F2ACF1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{BAD43339-DFA1-4B78-84F2-5E4B89CCF618}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED06DBA3-D182-438E-A1EC-059194F3959D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{65453C51-F488-4026-9596-05F765899247}"
@@ -21,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{27ADCE48-E13
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{07A6E36B-25A7-47FD-A399-7A722EABF7DF}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{E9DFE769-521F-426B-907D-F861F607401E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{041DE04E-8D55-4CF2-A174-2A836E8E4003}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{5B9F85DE-E93E-4509-8EF4-944BEFEFB419}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{EDCE44EC-0839-4737-9A81-9DE3E0B87404}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +73,26 @@ Global
 		{A60F4450-369D-4DF2-8FC0-462518A81DB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A60F4450-369D-4DF2-8FC0-462518A81DB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A60F4450-369D-4DF2-8FC0-462518A81DB9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A30BAAF3-634E-4E4F-B313-8C3FC945D577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A30BAAF3-634E-4E4F-B313-8C3FC945D577}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A30BAAF3-634E-4E4F-B313-8C3FC945D577}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A30BAAF3-634E-4E4F-B313-8C3FC945D577}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8AB4F59A-F763-4673-8B43-C2745E0A8135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8AB4F59A-F763-4673-8B43-C2745E0A8135}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8AB4F59A-F763-4673-8B43-C2745E0A8135}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8AB4F59A-F763-4673-8B43-C2745E0A8135}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3ED6BA8D-BFDC-4CFD-8AB8-D925E4F09E46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3ED6BA8D-BFDC-4CFD-8AB8-D925E4F09E46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3ED6BA8D-BFDC-4CFD-8AB8-D925E4F09E46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3ED6BA8D-BFDC-4CFD-8AB8-D925E4F09E46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D9C87A8-C288-428B-86D5-B09077F2ACF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D9C87A8-C288-428B-86D5-B09077F2ACF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D9C87A8-C288-428B-86D5-B09077F2ACF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D9C87A8-C288-428B-86D5-B09077F2ACF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BAD43339-DFA1-4B78-84F2-5E4B89CCF618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BAD43339-DFA1-4B78-84F2-5E4B89CCF618}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BAD43339-DFA1-4B78-84F2-5E4B89CCF618}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BAD43339-DFA1-4B78-84F2-5E4B89CCF618}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -67,6 +105,14 @@ Global
 		{941D72C5-CA37-4745-B89D-2257517C5761} = {27ADCE48-E139-48C1-A838-A0B8FBDECF95}
 		{8DBC1B4C-6689-429E-9315-1D935BC8A26E} = {07A6E36B-25A7-47FD-A399-7A722EABF7DF}
 		{61212F97-E2E3-4602-BDBC-B0BB4C3C7AFD} = {07A6E36B-25A7-47FD-A399-7A722EABF7DF}
+		{A30BAAF3-634E-4E4F-B313-8C3FC945D577} = {E9DFE769-521F-426B-907D-F861F607401E}
+		{8AB4F59A-F763-4673-8B43-C2745E0A8135} = {E9DFE769-521F-426B-907D-F861F607401E}
+		{E9DFE769-521F-426B-907D-F861F607401E} = {EDCE44EC-0839-4737-9A81-9DE3E0B87404}
+		{3ED6BA8D-BFDC-4CFD-8AB8-D925E4F09E46} = {041DE04E-8D55-4CF2-A174-2A836E8E4003}
+		{4D9C87A8-C288-428B-86D5-B09077F2ACF1} = {041DE04E-8D55-4CF2-A174-2A836E8E4003}
+		{041DE04E-8D55-4CF2-A174-2A836E8E4003} = {EDCE44EC-0839-4737-9A81-9DE3E0B87404}
+		{BAD43339-DFA1-4B78-84F2-5E4B89CCF618} = {5B9F85DE-E93E-4509-8EF4-944BEFEFB419}
+		{5B9F85DE-E93E-4509-8EF4-944BEFEFB419} = {EDCE44EC-0839-4737-9A81-9DE3E0B87404}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {568C6D8F-F5AD-4703-A695-EA54585C33D0}
diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/System.Runtime.InteropServices.JavaScript.sln b/src/libraries/System.Runtime.InteropServices.JavaScript/System.Runtime.InteropServices.JavaScript.sln
index 3adaa9f962288..0f5bce54f6882 100644
--- a/src/libraries/System.Runtime.InteropServices.JavaScript/System.Runtime.InteropServices.JavaScript.sln
+++ b/src/libraries/System.Runtime.InteropServices.JavaScript/System.Runtime.InteropServices.JavaScript.sln
@@ -25,6 +25,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ancillary.Interop", "..\Sys
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{44BAE6F1-94C2-415B-9A16-3B8EC429B09B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{4D8B7538-D933-4F3A-818D-4E19ABA7E182}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{6C60944F-4FE1-450F-884B-D523EDFCFAB3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{B8F2E56D-6571-466D-9EF2-9FCAD3FC6E5B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{42F9A600-BEC3-4F87-97EE-38E0DCAABC5A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{008873D5-9028-4FF3-8354-71F713748625}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{26A72FFB-871A-4F2F-A513-B2F6E09F358C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C22C479B-769A-4859-B974-E9B9D65918DE}"
@@ -33,6 +43,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F2C2C78A-CED
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7973EAA3-43B6-4D78-B24C-38BA6BC0D1E3}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{569E6837-0771-4C08-BB09-460281030538}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{67F3A00A-AE6C-434C-927D-E5D38DE2DA2C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{1DFF019B-6B73-4E5A-A6DA-5EBEF4AA7EBF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{F92020A9-28BE-4398-86FF-5CFE44C94882}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,6 +109,26 @@ Global
 		{44BAE6F1-94C2-415B-9A16-3B8EC429B09B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{44BAE6F1-94C2-415B-9A16-3B8EC429B09B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{44BAE6F1-94C2-415B-9A16-3B8EC429B09B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D8B7538-D933-4F3A-818D-4E19ABA7E182}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D8B7538-D933-4F3A-818D-4E19ABA7E182}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D8B7538-D933-4F3A-818D-4E19ABA7E182}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D8B7538-D933-4F3A-818D-4E19ABA7E182}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C60944F-4FE1-450F-884B-D523EDFCFAB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C60944F-4FE1-450F-884B-D523EDFCFAB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C60944F-4FE1-450F-884B-D523EDFCFAB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C60944F-4FE1-450F-884B-D523EDFCFAB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8F2E56D-6571-466D-9EF2-9FCAD3FC6E5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8F2E56D-6571-466D-9EF2-9FCAD3FC6E5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8F2E56D-6571-466D-9EF2-9FCAD3FC6E5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8F2E56D-6571-466D-9EF2-9FCAD3FC6E5B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42F9A600-BEC3-4F87-97EE-38E0DCAABC5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42F9A600-BEC3-4F87-97EE-38E0DCAABC5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42F9A600-BEC3-4F87-97EE-38E0DCAABC5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42F9A600-BEC3-4F87-97EE-38E0DCAABC5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{008873D5-9028-4FF3-8354-71F713748625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{008873D5-9028-4FF3-8354-71F713748625}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{008873D5-9028-4FF3-8354-71F713748625}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{008873D5-9028-4FF3-8354-71F713748625}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -109,6 +147,14 @@ Global
 		{09AA6758-0BD3-4312-9C07-AE9F1D50A3AD} = {F2C2C78A-CEDD-4DE0-9C3A-0195F00E0B4E}
 		{B4E3E774-2C16-4CBF-87EF-88C547529B94} = {F2C2C78A-CEDD-4DE0-9C3A-0195F00E0B4E}
 		{71A845ED-4344-41FC-8FCA-3AC9B6BA6C45} = {7973EAA3-43B6-4D78-B24C-38BA6BC0D1E3}
+		{4D8B7538-D933-4F3A-818D-4E19ABA7E182} = {569E6837-0771-4C08-BB09-460281030538}
+		{6C60944F-4FE1-450F-884B-D523EDFCFAB3} = {569E6837-0771-4C08-BB09-460281030538}
+		{569E6837-0771-4C08-BB09-460281030538} = {F92020A9-28BE-4398-86FF-5CFE44C94882}
+		{B8F2E56D-6571-466D-9EF2-9FCAD3FC6E5B} = {67F3A00A-AE6C-434C-927D-E5D38DE2DA2C}
+		{42F9A600-BEC3-4F87-97EE-38E0DCAABC5A} = {67F3A00A-AE6C-434C-927D-E5D38DE2DA2C}
+		{67F3A00A-AE6C-434C-927D-E5D38DE2DA2C} = {F92020A9-28BE-4398-86FF-5CFE44C94882}
+		{008873D5-9028-4FF3-8354-71F713748625} = {1DFF019B-6B73-4E5A-A6DA-5EBEF4AA7EBF}
+		{1DFF019B-6B73-4E5A-A6DA-5EBEF4AA7EBF} = {F92020A9-28BE-4398-86FF-5CFE44C94882}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3FE64246-4AFA-424A-AE5D-7007E20451B5}
diff --git a/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln b/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
index 1bf3d501dabe4..e9534f4a25c81 100644
--- a/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
+++ b/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
@@ -1,8 +1,4 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.7.33711.456
-MinimumVisualStudioVersion = 10.0.40219.1
+Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{94B59BA0-491F-4B59-ADFF-A057EC3EC835}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}"
@@ -57,21 +53,36 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\Syst
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\src\System.Threading.csproj", "{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B1678CCD-95C8-4419-B9F9-14A03061BE4B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{5600CDE1-139F-461B-8DD9-86FCC499DCC2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{169B126B-48DF-425C-B902-D376A689D9FB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{1347FE73-506C-4C44-A469-979F6ADB78BE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{B36C9254-0C55-414E-8403-03B4F18D5F35}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{052823B7-A9E0-41DE-87D8-D1CAF407B41D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FB99AC59-1744-4F12-A4B0-0D54FCA048BF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D893B9AA-57C5-49E3-97B1-12CC62D84307}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B1678CCD-95C8-4419-B9F9-14A03061BE4B}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{8826C1E1-CEBD-49F8-9BC8-97FECE60F9B9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{7B3C7C2F-58E0-4EE5-B904-9C978F40FD33}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{5114BD7E-8492-452A-8DAA-BF971D74A66D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{8FA3249B-3567-4C76-BA32-9488FC92994D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Checked|Any CPU = Checked|Any CPU
-		Checked|arm = Checked|arm
-		Checked|arm64 = Checked|arm64
-		Checked|x64 = Checked|x64
-		Checked|x86 = Checked|x86
 		Debug|Any CPU = Debug|Any CPU
 		Debug|arm = Debug|arm
 		Debug|arm64 = Debug|arm64
@@ -82,18 +93,13 @@ Global
 		Release|arm64 = Release|arm64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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|arm.ActiveCfg = Checked|arm
-		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|arm.Build.0 = Checked|arm
-		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|arm64.ActiveCfg = Checked|arm64
-		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|arm64.Build.0 = Checked|arm64
-		{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
 		{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|arm.ActiveCfg = Debug|arm
@@ -114,11 +120,16 @@ Global
 		{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
-		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|arm64.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
+		{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|arm.ActiveCfg = Checked|arm
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|arm.Build.0 = Checked|arm
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|arm64.ActiveCfg = Checked|arm64
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|arm64.Build.0 = Checked|arm64
+		{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|arm.ActiveCfg = Debug|Any CPU
@@ -135,11 +146,11 @@ Global
 		{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
-		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|arm64.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
 		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -156,11 +167,11 @@ Global
 		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Release|x64.Build.0 = Release|Any CPU
 		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Release|x86.ActiveCfg = Release|Any CPU
 		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Release|x86.Build.0 = Release|Any CPU
-		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -177,11 +188,11 @@ Global
 		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Release|x64.Build.0 = Release|Any CPU
 		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Release|x86.ActiveCfg = Release|Any CPU
 		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Release|x86.Build.0 = Release|Any CPU
-		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -198,11 +209,11 @@ Global
 		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Release|x64.Build.0 = Release|Any CPU
 		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Release|x86.ActiveCfg = Release|Any CPU
 		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Release|x86.Build.0 = Release|Any CPU
-		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -219,11 +230,11 @@ Global
 		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Release|x64.Build.0 = Release|Any CPU
 		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Release|x86.ActiveCfg = Release|Any CPU
 		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Release|x86.Build.0 = Release|Any CPU
-		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C4B641C3-3317-4913-91DA-0DA3B64BABED}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -240,11 +251,11 @@ Global
 		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Release|x64.Build.0 = Release|Any CPU
 		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Release|x86.ActiveCfg = Release|Any CPU
 		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Release|x86.Build.0 = Release|Any CPU
-		{716ED44B-37C8-4776-BE70-285952D2B30D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{716ED44B-37C8-4776-BE70-285952D2B30D}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{716ED44B-37C8-4776-BE70-285952D2B30D}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{716ED44B-37C8-4776-BE70-285952D2B30D}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{716ED44B-37C8-4776-BE70-285952D2B30D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{716ED44B-37C8-4776-BE70-285952D2B30D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{716ED44B-37C8-4776-BE70-285952D2B30D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{716ED44B-37C8-4776-BE70-285952D2B30D}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -261,11 +272,11 @@ Global
 		{716ED44B-37C8-4776-BE70-285952D2B30D}.Release|x64.Build.0 = Release|Any CPU
 		{716ED44B-37C8-4776-BE70-285952D2B30D}.Release|x86.ActiveCfg = Release|Any CPU
 		{716ED44B-37C8-4776-BE70-285952D2B30D}.Release|x86.Build.0 = Release|Any CPU
-		{1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{716ED44B-37C8-4776-BE70-285952D2B30D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{716ED44B-37C8-4776-BE70-285952D2B30D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{716ED44B-37C8-4776-BE70-285952D2B30D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{716ED44B-37C8-4776-BE70-285952D2B30D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{716ED44B-37C8-4776-BE70-285952D2B30D}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{1B248B4C-7584-4C04-850A-A50EB592052C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1B248B4C-7584-4C04-850A-A50EB592052C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1B248B4C-7584-4C04-850A-A50EB592052C}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -282,11 +293,11 @@ Global
 		{1B248B4C-7584-4C04-850A-A50EB592052C}.Release|x64.Build.0 = Release|Any CPU
 		{1B248B4C-7584-4C04-850A-A50EB592052C}.Release|x86.ActiveCfg = Release|Any CPU
 		{1B248B4C-7584-4C04-850A-A50EB592052C}.Release|x86.Build.0 = Release|Any CPU
-		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -303,11 +314,11 @@ Global
 		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Release|x64.Build.0 = Release|Any CPU
 		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Release|x86.ActiveCfg = Release|Any CPU
 		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Release|x86.Build.0 = Release|Any CPU
-		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -324,11 +335,11 @@ Global
 		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Release|x64.Build.0 = Release|Any CPU
 		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Release|x86.ActiveCfg = Release|Any CPU
 		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Release|x86.Build.0 = Release|Any CPU
-		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -345,11 +356,11 @@ Global
 		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Release|x64.Build.0 = Release|Any CPU
 		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Release|x86.ActiveCfg = Release|Any CPU
 		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Release|x86.Build.0 = Release|Any CPU
-		{768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{768B77B0-EA45-469D-B39E-545EB72F5A43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{768B77B0-EA45-469D-B39E-545EB72F5A43}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{768B77B0-EA45-469D-B39E-545EB72F5A43}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -366,11 +377,11 @@ Global
 		{768B77B0-EA45-469D-B39E-545EB72F5A43}.Release|x64.Build.0 = Release|Any CPU
 		{768B77B0-EA45-469D-B39E-545EB72F5A43}.Release|x86.ActiveCfg = Release|Any CPU
 		{768B77B0-EA45-469D-B39E-545EB72F5A43}.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|arm.ActiveCfg = Debug|Any CPU
-		{8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|arm64.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
+		{768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{768B77B0-EA45-469D-B39E-545EB72F5A43}.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|arm.ActiveCfg = Debug|Any CPU
@@ -387,11 +398,11 @@ Global
 		{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
-		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|arm64.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
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|arm64.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|arm.ActiveCfg = Debug|Any CPU
@@ -408,11 +419,11 @@ Global
 		{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
-		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|arm64.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
 		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -429,11 +440,11 @@ Global
 		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Release|x64.Build.0 = Release|Any CPU
 		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Release|x86.ActiveCfg = Release|Any CPU
 		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Release|x86.Build.0 = Release|Any CPU
-		{3741C833-C364-4269-9B1D-D442055DA7CE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{3741C833-C364-4269-9B1D-D442055DA7CE}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{3741C833-C364-4269-9B1D-D442055DA7CE}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{3741C833-C364-4269-9B1D-D442055DA7CE}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{3741C833-C364-4269-9B1D-D442055DA7CE}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{3741C833-C364-4269-9B1D-D442055DA7CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3741C833-C364-4269-9B1D-D442055DA7CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3741C833-C364-4269-9B1D-D442055DA7CE}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -450,11 +461,11 @@ Global
 		{3741C833-C364-4269-9B1D-D442055DA7CE}.Release|x64.Build.0 = Release|Any CPU
 		{3741C833-C364-4269-9B1D-D442055DA7CE}.Release|x86.ActiveCfg = Release|Any CPU
 		{3741C833-C364-4269-9B1D-D442055DA7CE}.Release|x86.Build.0 = Release|Any CPU
-		{1D771995-D475-429B-AC31-2B1F618AA45F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D771995-D475-429B-AC31-2B1F618AA45F}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{1D771995-D475-429B-AC31-2B1F618AA45F}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{1D771995-D475-429B-AC31-2B1F618AA45F}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{1D771995-D475-429B-AC31-2B1F618AA45F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3741C833-C364-4269-9B1D-D442055DA7CE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3741C833-C364-4269-9B1D-D442055DA7CE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3741C833-C364-4269-9B1D-D442055DA7CE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3741C833-C364-4269-9B1D-D442055DA7CE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3741C833-C364-4269-9B1D-D442055DA7CE}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{1D771995-D475-429B-AC31-2B1F618AA45F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1D771995-D475-429B-AC31-2B1F618AA45F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D771995-D475-429B-AC31-2B1F618AA45F}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -471,11 +482,11 @@ Global
 		{1D771995-D475-429B-AC31-2B1F618AA45F}.Release|x64.Build.0 = Release|Any CPU
 		{1D771995-D475-429B-AC31-2B1F618AA45F}.Release|x86.ActiveCfg = Release|Any CPU
 		{1D771995-D475-429B-AC31-2B1F618AA45F}.Release|x86.Build.0 = Release|Any CPU
-		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1D771995-D475-429B-AC31-2B1F618AA45F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D771995-D475-429B-AC31-2B1F618AA45F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1D771995-D475-429B-AC31-2B1F618AA45F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1D771995-D475-429B-AC31-2B1F618AA45F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1D771995-D475-429B-AC31-2B1F618AA45F}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -492,11 +503,11 @@ Global
 		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Release|x64.Build.0 = Release|Any CPU
 		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Release|x86.ActiveCfg = Release|Any CPU
 		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Release|x86.Build.0 = Release|Any CPU
-		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -513,11 +524,11 @@ Global
 		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Release|x64.Build.0 = Release|Any CPU
 		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Release|x86.ActiveCfg = Release|Any CPU
 		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Release|x86.Build.0 = Release|Any CPU
-		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -534,11 +545,11 @@ Global
 		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Release|x64.Build.0 = Release|Any CPU
 		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Release|x86.ActiveCfg = Release|Any CPU
 		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Release|x86.Build.0 = Release|Any CPU
-		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -555,11 +566,11 @@ Global
 		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Release|x64.Build.0 = Release|Any CPU
 		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Release|x86.ActiveCfg = Release|Any CPU
 		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Release|x86.Build.0 = Release|Any CPU
-		{866D295E-424A-4747-9417-CD7746936138}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{866D295E-424A-4747-9417-CD7746936138}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{866D295E-424A-4747-9417-CD7746936138}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{866D295E-424A-4747-9417-CD7746936138}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{866D295E-424A-4747-9417-CD7746936138}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{866D295E-424A-4747-9417-CD7746936138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{866D295E-424A-4747-9417-CD7746936138}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{866D295E-424A-4747-9417-CD7746936138}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -576,11 +587,11 @@ Global
 		{866D295E-424A-4747-9417-CD7746936138}.Release|x64.Build.0 = Release|Any CPU
 		{866D295E-424A-4747-9417-CD7746936138}.Release|x86.ActiveCfg = Release|Any CPU
 		{866D295E-424A-4747-9417-CD7746936138}.Release|x86.Build.0 = Release|Any CPU
-		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{866D295E-424A-4747-9417-CD7746936138}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{866D295E-424A-4747-9417-CD7746936138}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{866D295E-424A-4747-9417-CD7746936138}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{866D295E-424A-4747-9417-CD7746936138}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{866D295E-424A-4747-9417-CD7746936138}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -597,11 +608,11 @@ Global
 		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Release|x64.Build.0 = Release|Any CPU
 		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Release|x86.ActiveCfg = Release|Any CPU
 		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Release|x86.Build.0 = Release|Any CPU
-		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -618,11 +629,11 @@ Global
 		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Release|x64.Build.0 = Release|Any CPU
 		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Release|x86.ActiveCfg = Release|Any CPU
 		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Release|x86.Build.0 = Release|Any CPU
-		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -639,11 +650,11 @@ Global
 		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Release|x64.Build.0 = Release|Any CPU
 		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Release|x86.ActiveCfg = Release|Any CPU
 		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Release|x86.Build.0 = Release|Any CPU
-		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C7DAC270-CC93-4C97-9A8D-6E724A10727D}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -660,26 +671,123 @@ Global
 		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Release|x64.Build.0 = Release|Any CPU
 		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Release|x86.ActiveCfg = Release|Any CPU
 		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Release|x86.Build.0 = Release|Any CPU
+		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Debug|x64.Build.0 = Debug|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Debug|x86.Build.0 = Debug|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Release|arm.ActiveCfg = Release|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Release|arm64.ActiveCfg = Release|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Release|x64.ActiveCfg = Release|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Release|x64.Build.0 = Release|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Release|x86.ActiveCfg = Release|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Release|x86.Build.0 = Release|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Debug|x64.Build.0 = Debug|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Debug|x86.Build.0 = Debug|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Release|arm.ActiveCfg = Release|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Release|arm64.ActiveCfg = Release|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Release|x64.ActiveCfg = Release|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Release|x64.Build.0 = Release|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Release|x86.ActiveCfg = Release|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Release|x86.Build.0 = Release|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{169B126B-48DF-425C-B902-D376A689D9FB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Debug|x64.Build.0 = Debug|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Debug|x86.Build.0 = Debug|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Release|arm.ActiveCfg = Release|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Release|x64.ActiveCfg = Release|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Release|x64.Build.0 = Release|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Release|x86.ActiveCfg = Release|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Release|x86.Build.0 = Release|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Debug|x64.Build.0 = Debug|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Debug|x86.Build.0 = Debug|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Release|arm.ActiveCfg = Release|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Release|x64.ActiveCfg = Release|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Release|x64.Build.0 = Release|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Release|x86.ActiveCfg = Release|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Release|x86.Build.0 = Release|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1347FE73-506C-4C44-A469-979F6ADB78BE}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Debug|x64.Build.0 = Debug|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Debug|x86.Build.0 = Debug|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Release|arm.ActiveCfg = Release|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Release|x64.ActiveCfg = Release|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Release|x64.Build.0 = Release|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Release|x86.ActiveCfg = Release|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Release|x86.Build.0 = Release|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B36C9254-0C55-414E-8403-03B4F18D5F35}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{94B59BA0-491F-4B59-ADFF-A057EC3EC835} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B}
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835} = {052823B7-A9E0-41DE-87D8-D1CAF407B41D}
 		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
-		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0} = {D893B9AA-57C5-49E3-97B1-12CC62D84307}
-		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B}
-		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A} = {D893B9AA-57C5-49E3-97B1-12CC62D84307}
-		{C4B641C3-3317-4913-91DA-0DA3B64BABED} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B}
-		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20} = {D893B9AA-57C5-49E3-97B1-12CC62D84307}
-		{716ED44B-37C8-4776-BE70-285952D2B30D} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B}
-		{1B248B4C-7584-4C04-850A-A50EB592052C} = {E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33}
-		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886} = {D893B9AA-57C5-49E3-97B1-12CC62D84307}
-		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5} = {E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33}
-		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40} = {E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33}
-		{768B77B0-EA45-469D-B39E-545EB72F5A43} = {E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33}
-		{8671F164-F78C-44FA-93B7-A310F67890FE} = {D893B9AA-57C5-49E3-97B1-12CC62D84307}
-		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B}
 		{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
 		{3741C833-C364-4269-9B1D-D442055DA7CE} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
 		{1D771995-D475-429B-AC31-2B1F618AA45F} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
@@ -689,14 +797,32 @@ Global
 		{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
 		{866D295E-424A-4747-9417-CD7746936138} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
 		{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
+		{0E0D5A1F-0212-4CEB-BADA-E1E3ABD395A0} = {D893B9AA-57C5-49E3-97B1-12CC62D84307}
+		{4859BEE3-34B7-48E7-83D4-1ADD8B8F3B3A} = {D893B9AA-57C5-49E3-97B1-12CC62D84307}
+		{3FB6F2AA-E763-4336-B927-18AB7AAF6C20} = {D893B9AA-57C5-49E3-97B1-12CC62D84307}
+		{EF39CC5C-7A3B-40F2-82B6-C1C8BBC3F886} = {D893B9AA-57C5-49E3-97B1-12CC62D84307}
+		{8671F164-F78C-44FA-93B7-A310F67890FE} = {D893B9AA-57C5-49E3-97B1-12CC62D84307}
 		{0B5FD0C2-367D-4AD6-8001-80AD79B2441C} = {D893B9AA-57C5-49E3-97B1-12CC62D84307}
 		{C7DAC270-CC93-4C97-9A8D-6E724A10727D} = {D893B9AA-57C5-49E3-97B1-12CC62D84307}
+		{F552E4E4-20EE-484C-84F8-4FB3A3BD2E69} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B}
+		{C4B641C3-3317-4913-91DA-0DA3B64BABED} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B}
+		{716ED44B-37C8-4776-BE70-285952D2B30D} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B}
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B}
 		{C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B}
+		{1B248B4C-7584-4C04-850A-A50EB592052C} = {E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33}
+		{C3EA0A28-A597-4946-9E08-EBBBFA94BFA5} = {E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33}
+		{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40} = {E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33}
+		{768B77B0-EA45-469D-B39E-545EB72F5A43} = {E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33}
+		{5600CDE1-139F-461B-8DD9-86FCC499DCC2} = {8826C1E1-CEBD-49F8-9BC8-97FECE60F9B9}
+		{169B126B-48DF-425C-B902-D376A689D9FB} = {8826C1E1-CEBD-49F8-9BC8-97FECE60F9B9}
+		{8826C1E1-CEBD-49F8-9BC8-97FECE60F9B9} = {8FA3249B-3567-4C76-BA32-9488FC92994D}
+		{8EA17297-41EE-4CEE-AF61-F047D6F7A1AB} = {7B3C7C2F-58E0-4EE5-B904-9C978F40FD33}
+		{1347FE73-506C-4C44-A469-979F6ADB78BE} = {7B3C7C2F-58E0-4EE5-B904-9C978F40FD33}
+		{7B3C7C2F-58E0-4EE5-B904-9C978F40FD33} = {8FA3249B-3567-4C76-BA32-9488FC92994D}
+		{B36C9254-0C55-414E-8403-03B4F18D5F35} = {5114BD7E-8492-452A-8DAA-BF971D74A66D}
+		{5114BD7E-8492-452A-8DAA-BF971D74A66D} = {8FA3249B-3567-4C76-BA32-9488FC92994D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D4031401-FEB5-4CCF-91C1-38F5646B2BFD}
 	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		..\System.Private.CoreLib\src\System.Private.CoreLib.Shared.projitems*{94b59ba0-491f-4b59-adff-a057ec3ec835}*SharedItemsImports = 5
-	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 29c357fd6f53d..e71c73901eb77 100644
--- a/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln
+++ b/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln
@@ -23,7 +23,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Intrinsics.T
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{2A6ED99F-FFEC-4FA7-BEF7-E5339C9D99BB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F110DBFA-22D7-486A-993D-5461A57A1D50}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{022E0D70-D39E-4715-8484-8D2AC264304B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{31B3B363-9E3C-4B29-B040-804F65F03D12}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{9AF18F33-B541-4C24-A474-2DAF277D436E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{822F0A44-721C-42BB-8C66-C73ADC29D0D6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{80C7CB4D-47F4-416B-AE32-656C04C8CA87}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C5014AA7-5C35-45D5-B7C6-48A5E93A758E}"
 EndProject
@@ -31,6 +41,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E7A9B89D-A9F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A499E9EC-3C82-4B0A-AC49-111C706B1835}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F110DBFA-22D7-486A-993D-5461A57A1D50}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0ECF6939-6099-448F-A3E5-B8069E092C2F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{5D25490B-EE25-44ED-9B06-D0A41C73DB12}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{BFA6F611-C767-4697-AD3E-9E3FF6132FAB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{D9C1BAD0-2991-4FC9-9718-3EF7D2B7A54F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -311,13 +331,117 @@ Global
 		{2A6ED99F-FFEC-4FA7-BEF7-E5339C9D99BB}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{2A6ED99F-FFEC-4FA7-BEF7-E5339C9D99BB}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{2A6ED99F-FFEC-4FA7-BEF7-E5339C9D99BB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Debug|x64.Build.0 = Debug|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Debug|x86.Build.0 = Debug|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Release|arm.ActiveCfg = Release|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Release|x64.ActiveCfg = Release|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Release|x64.Build.0 = Release|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Release|x86.ActiveCfg = Release|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Release|x86.Build.0 = Release|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{022E0D70-D39E-4715-8484-8D2AC264304B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Debug|x64.Build.0 = Debug|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Debug|x86.Build.0 = Debug|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Release|arm.ActiveCfg = Release|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Release|arm64.ActiveCfg = Release|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Release|x64.ActiveCfg = Release|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Release|x64.Build.0 = Release|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Release|x86.ActiveCfg = Release|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Release|x86.Build.0 = Release|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{31B3B363-9E3C-4B29-B040-804F65F03D12}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Debug|x64.Build.0 = Debug|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Debug|x86.Build.0 = Debug|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Release|arm.ActiveCfg = Release|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Release|x64.ActiveCfg = Release|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Release|x64.Build.0 = Release|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Release|x86.ActiveCfg = Release|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Release|x86.Build.0 = Release|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9AF18F33-B541-4C24-A474-2DAF277D436E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Debug|x64.Build.0 = Debug|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Debug|x86.Build.0 = Debug|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Release|arm.ActiveCfg = Release|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Release|x64.ActiveCfg = Release|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Release|x64.Build.0 = Release|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Release|x86.ActiveCfg = Release|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Release|x86.Build.0 = Release|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Debug|x64.Build.0 = Debug|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Debug|x86.Build.0 = Debug|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Release|arm.ActiveCfg = Release|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Release|x64.ActiveCfg = Release|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Release|x64.Build.0 = Release|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Release|x86.ActiveCfg = Release|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Release|x86.Build.0 = Release|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{5965CFFE-886A-418C-854F-5967D91DE914} = {F110DBFA-22D7-486A-993D-5461A57A1D50}
-		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C} = {F110DBFA-22D7-486A-993D-5461A57A1D50}
+		{5965CFFE-886A-418C-854F-5967D91DE914} = {80C7CB4D-47F4-416B-AE32-656C04C8CA87}
 		{2644B828-C37C-45C1-933D-27E82DA0A098} = {C5014AA7-5C35-45D5-B7C6-48A5E93A758E}
 		{EFF55B56-D92B-4573-94EA-AF5B3B001C34} = {C5014AA7-5C35-45D5-B7C6-48A5E93A758E}
 		{80AFB6EB-AB23-48A1-951C-76E6FEA29D19} = {C5014AA7-5C35-45D5-B7C6-48A5E93A758E}
@@ -328,6 +452,15 @@ Global
 		{A4058388-97C1-492A-86A4-5240C4166BFF} = {A499E9EC-3C82-4B0A-AC49-111C706B1835}
 		{FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF} = {A499E9EC-3C82-4B0A-AC49-111C706B1835}
 		{9A0BF7EC-AD07-44C8-9B70-9DACB2C894C7} = {A499E9EC-3C82-4B0A-AC49-111C706B1835}
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C} = {F110DBFA-22D7-486A-993D-5461A57A1D50}
+		{022E0D70-D39E-4715-8484-8D2AC264304B} = {0ECF6939-6099-448F-A3E5-B8069E092C2F}
+		{31B3B363-9E3C-4B29-B040-804F65F03D12} = {0ECF6939-6099-448F-A3E5-B8069E092C2F}
+		{0ECF6939-6099-448F-A3E5-B8069E092C2F} = {D9C1BAD0-2991-4FC9-9718-3EF7D2B7A54F}
+		{9AF18F33-B541-4C24-A474-2DAF277D436E} = {5D25490B-EE25-44ED-9B06-D0A41C73DB12}
+		{822F0A44-721C-42BB-8C66-C73ADC29D0D6} = {5D25490B-EE25-44ED-9B06-D0A41C73DB12}
+		{5D25490B-EE25-44ED-9B06-D0A41C73DB12} = {D9C1BAD0-2991-4FC9-9718-3EF7D2B7A54F}
+		{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE} = {BFA6F611-C767-4697-AD3E-9E3FF6132FAB}
+		{BFA6F611-C767-4697-AD3E-9E3FF6132FAB} = {D9C1BAD0-2991-4FC9-9718-3EF7D2B7A54F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9205DA5F-88A2-4045-9B31-9CC53CCF7550}
diff --git a/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln b/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln
index 2e2720988c8c8..a81c2bc8c7ea8 100644
--- a/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln
+++ b/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln
@@ -35,6 +35,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.FirstCallAfterUpdate", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.FirstCallAfterUpdate\System.Reflection.Metadata.ApplyUpdate.Test.FirstCallAfterUpdate.csproj", "{3E342557-A99F-4A52-826E-6854A1D8D65C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.GenericAddInstanceField", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.GenericAddInstanceField\System.Reflection.Metadata.ApplyUpdate.Test.GenericAddInstanceField.csproj", "{32B30EA9-CD06-4069-BA31-05EA4A260EF5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.GenericAddStaticField", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.GenericAddStaticField\System.Reflection.Metadata.ApplyUpdate.Test.GenericAddStaticField.csproj", "{35692A86-DE04-41CA-9FCE-D129E0E04993}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.LambdaBodyChange", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.LambdaBodyChange\System.Reflection.Metadata.ApplyUpdate.Test.LambdaBodyChange.csproj", "{9D747A8D-A9DE-4470-9CF6-F73DF60FC5F6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.LambdaCapturesThis", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.LambdaCapturesThis\System.Reflection.Metadata.ApplyUpdate.Test.LambdaCapturesThis.csproj", "{D80CE4B6-896E-4243-B2BA-443E821AC8FF}"
@@ -73,7 +77,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.Tests
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{06E15C97-C87D-473E-9E44-DCE169B1CE4E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6963C709-FD2F-45A7-9A9D-431B1E9A4796}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{56597012-9BD9-4167-8DF3-539119192932}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{29B354FC-0F90-4D2D-9104-3A7966D53C08}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{6C305566-89A5-422C-8C99-5329E4D63CB0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}"
 EndProject
@@ -81,6 +95,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{153EEF5A-58C
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C75ECE17-3CF5-409D-B26F-E2F5053DD5B9}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6963C709-FD2F-45A7-9A9D-431B1E9A4796}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CE02FBA2-6B23-42AB-AB33-7FD47B1C9B57}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D6103051-0541-4BA6-A966-C1E090F6099E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{589D96BF-47A1-41B9-96B8-D273BC877068}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{034612B2-91C8-4334-8F13-7AB773150F72}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -487,6 +511,48 @@ Global
 		{3E342557-A99F-4A52-826E-6854A1D8D65C}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{3E342557-A99F-4A52-826E-6854A1D8D65C}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{3E342557-A99F-4A52-826E-6854A1D8D65C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Debug|x64.Build.0 = Debug|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Debug|x86.Build.0 = Debug|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Release|arm.ActiveCfg = Release|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Release|x64.ActiveCfg = Release|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Release|x64.Build.0 = Release|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Release|x86.ActiveCfg = Release|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Release|x86.Build.0 = Release|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Debug|x64.Build.0 = Debug|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Debug|x86.Build.0 = Debug|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Release|Any CPU.Build.0 = Release|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Release|arm.ActiveCfg = Release|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Release|arm64.ActiveCfg = Release|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Release|x64.ActiveCfg = Release|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Release|x64.Build.0 = Release|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Release|x86.ActiveCfg = Release|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Release|x86.Build.0 = Release|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{35692A86-DE04-41CA-9FCE-D129E0E04993}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{9D747A8D-A9DE-4470-9CF6-F73DF60FC5F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9D747A8D-A9DE-4470-9CF6-F73DF60FC5F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9D747A8D-A9DE-4470-9CF6-F73DF60FC5F6}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -886,13 +952,117 @@ Global
 		{06E15C97-C87D-473E-9E44-DCE169B1CE4E}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{06E15C97-C87D-473E-9E44-DCE169B1CE4E}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{06E15C97-C87D-473E-9E44-DCE169B1CE4E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Debug|x64.Build.0 = Debug|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Debug|x86.Build.0 = Debug|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Release|arm.ActiveCfg = Release|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Release|arm64.ActiveCfg = Release|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Release|x64.ActiveCfg = Release|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Release|x64.Build.0 = Release|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Release|x86.ActiveCfg = Release|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Release|x86.Build.0 = Release|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{56597012-9BD9-4167-8DF3-539119192932}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Debug|x64.Build.0 = Debug|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Debug|x86.Build.0 = Debug|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Release|arm.ActiveCfg = Release|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Release|arm64.ActiveCfg = Release|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Release|x64.ActiveCfg = Release|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Release|x64.Build.0 = Release|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Release|x86.ActiveCfg = Release|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Release|x86.Build.0 = Release|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Debug|x64.Build.0 = Debug|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Debug|x86.Build.0 = Debug|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Release|arm.ActiveCfg = Release|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Release|arm64.ActiveCfg = Release|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Release|x64.ActiveCfg = Release|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Release|x64.Build.0 = Release|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Release|x86.ActiveCfg = Release|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Release|x86.Build.0 = Release|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Debug|x64.Build.0 = Debug|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Debug|x86.Build.0 = Debug|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Release|arm.ActiveCfg = Release|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Release|x64.ActiveCfg = Release|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Release|x64.Build.0 = Release|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Release|x86.ActiveCfg = Release|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Release|x86.Build.0 = Release|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Debug|x64.Build.0 = Debug|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Debug|x86.Build.0 = Debug|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Release|arm.ActiveCfg = Release|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Release|x64.ActiveCfg = Release|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Release|x64.Build.0 = Release|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Release|x86.ActiveCfg = Release|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Release|x86.Build.0 = Release|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558} = {6963C709-FD2F-45A7-9A9D-431B1E9A4796}
-		{B8F22D73-B183-4F17-9D5E-04B80699E56A} = {6963C709-FD2F-45A7-9A9D-431B1E9A4796}
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558} = {6C305566-89A5-422C-8C99-5329E4D63CB0}
 		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}
 		{C9E75518-3DA7-4831-97D5-DCC2E8E99D34} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}
 		{C0B73BCE-3D60-4737-B958-C4AA39C7056A} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}
@@ -904,6 +1074,8 @@ Global
 		{EEAE2A15-E2AE-4421-8D30-AAB17AC805F8} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}
 		{78C4F407-C2E0-46BA-A4A0-EE04D89A2EB5} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}
 		{3E342557-A99F-4A52-826E-6854A1D8D65C} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}
+		{32B30EA9-CD06-4069-BA31-05EA4A260EF5} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}
+		{35692A86-DE04-41CA-9FCE-D129E0E04993} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}
 		{9D747A8D-A9DE-4470-9CF6-F73DF60FC5F6} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}
 		{D80CE4B6-896E-4243-B2BA-443E821AC8FF} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}
 		{71B8CD61-839D-445C-8E7D-F0F67CE00527} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}
@@ -928,6 +1100,15 @@ Global
 		{D7654D83-1D00-4121-BA8B-187EDD1E9EC1} = {C75ECE17-3CF5-409D-B26F-E2F5053DD5B9}
 		{95B66B14-BCC7-407A-930C-4B34D4F7EC98} = {C75ECE17-3CF5-409D-B26F-E2F5053DD5B9}
 		{06E15C97-C87D-473E-9E44-DCE169B1CE4E} = {C75ECE17-3CF5-409D-B26F-E2F5053DD5B9}
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A} = {6963C709-FD2F-45A7-9A9D-431B1E9A4796}
+		{56597012-9BD9-4167-8DF3-539119192932} = {CE02FBA2-6B23-42AB-AB33-7FD47B1C9B57}
+		{29B354FC-0F90-4D2D-9104-3A7966D53C08} = {CE02FBA2-6B23-42AB-AB33-7FD47B1C9B57}
+		{CE02FBA2-6B23-42AB-AB33-7FD47B1C9B57} = {034612B2-91C8-4334-8F13-7AB773150F72}
+		{39FDFD33-675E-424E-A7B9-7CF5FF0D6A00} = {D6103051-0541-4BA6-A966-C1E090F6099E}
+		{7A3AEC4B-94F4-4E52-983A-ADFF20A84EEF} = {D6103051-0541-4BA6-A966-C1E090F6099E}
+		{D6103051-0541-4BA6-A966-C1E090F6099E} = {034612B2-91C8-4334-8F13-7AB773150F72}
+		{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71} = {589D96BF-47A1-41B9-96B8-D273BC877068}
+		{589D96BF-47A1-41B9-96B8-D273BC877068} = {034612B2-91C8-4334-8F13-7AB773150F72}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {73D0667D-A181-41CA-B57B-DD177166E019}
diff --git a/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln b/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln
index 5da865b1d49b3..b4c59026fc90a 100644
--- a/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln
+++ b/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln
@@ -13,6 +13,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Numerics.Tes
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{DB1922E9-EC35-44AC-9677-277B7D00595F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{E51A43E1-C483-49BD-A16A-F6594C0FD8BA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{334A6BCF-AE0E-410F-BA09-9A26FEB98E23}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{C8C2AACC-6E96-4EF2-9F2C-D58FF3669F0A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{523AB0A0-A918-4653-B124-B035208ABC43}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{0E7B282F-C829-4069-BC63-71273B776283}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A80D3604-A8C8-4B23-B0D3-316E46CFE60A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{94F2DDDF-A2DA-4F69-9613-A92D50D84A1C}"
@@ -21,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{18C5FB7C-2DE
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F6066198-D324-499F-BEB7-55DF39460AB4}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{A5E64CFC-B98F-4DA2-AA85-1D97F7284D6D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{04438AE1-0622-48D2-9A83-E65949565E79}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{635DD8C9-244A-4455-AA95-DAE36374BE6D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{9AC979A9-D36E-4855-9F86-D7C5886B1743}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +73,26 @@ Global
 		{DB1922E9-EC35-44AC-9677-277B7D00595F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DB1922E9-EC35-44AC-9677-277B7D00595F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB1922E9-EC35-44AC-9677-277B7D00595F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E51A43E1-C483-49BD-A16A-F6594C0FD8BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E51A43E1-C483-49BD-A16A-F6594C0FD8BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E51A43E1-C483-49BD-A16A-F6594C0FD8BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E51A43E1-C483-49BD-A16A-F6594C0FD8BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{334A6BCF-AE0E-410F-BA09-9A26FEB98E23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{334A6BCF-AE0E-410F-BA09-9A26FEB98E23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{334A6BCF-AE0E-410F-BA09-9A26FEB98E23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{334A6BCF-AE0E-410F-BA09-9A26FEB98E23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8C2AACC-6E96-4EF2-9F2C-D58FF3669F0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8C2AACC-6E96-4EF2-9F2C-D58FF3669F0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8C2AACC-6E96-4EF2-9F2C-D58FF3669F0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8C2AACC-6E96-4EF2-9F2C-D58FF3669F0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{523AB0A0-A918-4653-B124-B035208ABC43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{523AB0A0-A918-4653-B124-B035208ABC43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{523AB0A0-A918-4653-B124-B035208ABC43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{523AB0A0-A918-4653-B124-B035208ABC43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E7B282F-C829-4069-BC63-71273B776283}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E7B282F-C829-4069-BC63-71273B776283}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E7B282F-C829-4069-BC63-71273B776283}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E7B282F-C829-4069-BC63-71273B776283}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -67,6 +105,14 @@ Global
 		{C91AC3B4-647B-4D7F-83CA-BE90FFFC8CF3} = {18C5FB7C-2DE7-4BED-BA2B-53776E78E1E5}
 		{DB1922E9-EC35-44AC-9677-277B7D00595F} = {18C5FB7C-2DE7-4BED-BA2B-53776E78E1E5}
 		{91F8FBEF-C085-4542-BEE4-22449D80734A} = {F6066198-D324-499F-BEB7-55DF39460AB4}
+		{E51A43E1-C483-49BD-A16A-F6594C0FD8BA} = {A5E64CFC-B98F-4DA2-AA85-1D97F7284D6D}
+		{334A6BCF-AE0E-410F-BA09-9A26FEB98E23} = {A5E64CFC-B98F-4DA2-AA85-1D97F7284D6D}
+		{A5E64CFC-B98F-4DA2-AA85-1D97F7284D6D} = {9AC979A9-D36E-4855-9F86-D7C5886B1743}
+		{C8C2AACC-6E96-4EF2-9F2C-D58FF3669F0A} = {04438AE1-0622-48D2-9A83-E65949565E79}
+		{523AB0A0-A918-4653-B124-B035208ABC43} = {04438AE1-0622-48D2-9A83-E65949565E79}
+		{04438AE1-0622-48D2-9A83-E65949565E79} = {9AC979A9-D36E-4855-9F86-D7C5886B1743}
+		{0E7B282F-C829-4069-BC63-71273B776283} = {635DD8C9-244A-4455-AA95-DAE36374BE6D}
+		{635DD8C9-244A-4455-AA95-DAE36374BE6D} = {9AC979A9-D36E-4855-9F86-D7C5886B1743}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B7C7E4C6-78B9-4AE7-AC8B-4F08EAD0DECB}
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 e5f125402fc51..5d7a0150f09e3 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
@@ -3,6 +3,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", ".
 EndProject
 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.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{1388F142-B5C8-4AC7-ABEA-07391751511C}"
+EndProject
 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.CodeDom", "..\System.CodeDom\src\System.CodeDom.csproj", "{FA9FDA97-57C2-421C-A578-EEB0B600A412}"
@@ -99,8 +101,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "..\System.Text.Encoding.CodePages\src\System.Text.Encoding.CodePages.csproj", "{7913F002-64DC-43C6-9D74-B0B9BA297F00}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Generator", "..\System.Text.RegularExpressions\gen\System.Text.RegularExpressions.Generator.csproj", "{39F345C7-BA27-4540-9BCE-45E634DA6035}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels", "..\System.Threading.Channels\ref\System.Threading.Channels.csproj", "{E72B45B0-D05E-4F86-86E4-45B65FBB6617}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels", "..\System.Threading.Channels\src\System.Threading.Channels.csproj", "{B6953324-8866-4D94-B352-20EF38EA6774}"
@@ -113,14 +113,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{78994C91-3A4F-4825-86C2-21FB4F082CA7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{0CA04347-D51A-4F7C-927C-FB45E2B266D8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{E118B30B-6805-477B-A402-3DBD66DD619E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{860E324D-4B26-4F48-B7AC-44EED82A8EA7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{092510BD-C3F8-4397-A2BC-149309C2B0D3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F8CB1B1F-F935-4ECE-B3C2-CF62B5654BF2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{56502718-F82A-46E2-9AD0-532C437EC51E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A8ED4215-E7B8-4F14-B61D-F737E24C856A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D46042B1-7AEB-4642-8591-E6B3F2E0F1C4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{E8705420-F755-4CBA-970D-B745F59F9780}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{CDD72541-F0ED-41FA-9C9A-5D774CEB22E4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{21D78340-7F96-4519-983F-529077A11AE1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -191,6 +211,27 @@ Global
 		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Checked|arm64.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
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Debug|x64.Build.0 = Debug|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Debug|x86.Build.0 = Debug|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Release|arm.ActiveCfg = Release|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Release|x64.ActiveCfg = Release|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Release|x64.Build.0 = Release|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Release|x86.ActiveCfg = Release|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Release|x86.Build.0 = Release|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1388F142-B5C8-4AC7-ABEA-07391751511C}.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|arm.ActiveCfg = Debug|Any CPU
@@ -1199,27 +1240,6 @@ Global
 		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Checked|arm64.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
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Debug|arm.ActiveCfg = Debug|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Debug|x64.Build.0 = Debug|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Debug|x86.Build.0 = Debug|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Release|arm.ActiveCfg = Release|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Release|arm64.ActiveCfg = Release|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Release|x64.ActiveCfg = Release|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Release|x64.Build.0 = Release|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Release|x86.ActiveCfg = Release|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Release|x86.Build.0 = Release|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{39F345C7-BA27-4540-9BCE-45E634DA6035}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{E72B45B0-D05E-4F86-86E4-45B65FBB6617}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E72B45B0-D05E-4F86-86E4-45B65FBB6617}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E72B45B0-D05E-4F86-86E4-45B65FBB6617}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -1346,12 +1366,120 @@ Global
 		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Checked|arm64.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
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Debug|x64.Build.0 = Debug|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Release|arm.ActiveCfg = Release|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Release|x64.ActiveCfg = Release|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Release|x64.Build.0 = Release|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Release|x86.ActiveCfg = Release|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Release|x86.Build.0 = Release|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Debug|x64.Build.0 = Debug|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Debug|x86.Build.0 = Debug|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Release|arm.ActiveCfg = Release|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Release|x64.ActiveCfg = Release|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Release|x64.Build.0 = Release|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Release|x86.ActiveCfg = Release|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Release|x86.Build.0 = Release|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E118B30B-6805-477B-A402-3DBD66DD619E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Debug|x64.Build.0 = Debug|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Debug|x86.Build.0 = Debug|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Release|arm.ActiveCfg = Release|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Release|arm64.ActiveCfg = Release|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Release|x64.ActiveCfg = Release|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Release|x64.Build.0 = Release|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Release|x86.ActiveCfg = Release|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Release|x86.Build.0 = Release|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Debug|x64.Build.0 = Debug|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Debug|x86.Build.0 = Debug|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Release|arm.ActiveCfg = Release|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Release|x64.ActiveCfg = Release|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Release|x64.Build.0 = Release|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Release|x86.ActiveCfg = Release|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Release|x86.Build.0 = Release|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Debug|x64.Build.0 = Debug|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Debug|x86.Build.0 = Debug|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Release|arm.ActiveCfg = Release|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Release|x64.ActiveCfg = Release|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Release|x64.Build.0 = Release|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Release|x86.ActiveCfg = Release|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Release|x86.Build.0 = Release|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{096171D9-C978-4509-B9D3-B6DBCD78420D} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
+		{096171D9-C978-4509-B9D3-B6DBCD78420D} = {092510BD-C3F8-4397-A2BC-149309C2B0D3}
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6} = {F8CB1B1F-F935-4ECE-B3C2-CF62B5654BF2}
+		{3D4DD468-10FE-4606-BA10-F848447AF157} = {F8CB1B1F-F935-4ECE-B3C2-CF62B5654BF2}
+		{1388F142-B5C8-4AC7-ABEA-07391751511C} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
 		{FA9FDA97-57C2-421C-A578-EEB0B600A412} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
 		{82E81182-3C80-40A9-978A-4152461F4FE4} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
 		{81F58927-6022-4DD7-9E78-BDD3DA309285} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
@@ -1377,8 +1505,6 @@ Global
 		{B6953324-8866-4D94-B352-20EF38EA6774} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
 		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
 		{78994C91-3A4F-4825-86C2-21FB4F082CA7} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6} = {F8CB1B1F-F935-4ECE-B3C2-CF62B5654BF2}
-		{3D4DD468-10FE-4606-BA10-F848447AF157} = {F8CB1B1F-F935-4ECE-B3C2-CF62B5654BF2}
 		{A1BEF14B-0C13-4854-8299-DADF0D1181D9} = {56502718-F82A-46E2-9AD0-532C437EC51E}
 		{A71C8379-F67C-42A1-B6CD-8C0942757B93} = {56502718-F82A-46E2-9AD0-532C437EC51E}
 		{348D0950-A458-487D-9A30-FF60BCB715D9} = {56502718-F82A-46E2-9AD0-532C437EC51E}
@@ -1407,7 +1533,14 @@ Global
 		{C53A69A6-5DD9-4C53-AE34-88424D0A043D} = {A8ED4215-E7B8-4F14-B61D-F737E24C856A}
 		{4695E11B-4AB8-4376-832D-54344DD42316} = {A8ED4215-E7B8-4F14-B61D-F737E24C856A}
 		{B6796238-B6F5-488E-97A9-50EC2966B633} = {A8ED4215-E7B8-4F14-B61D-F737E24C856A}
-		{39F345C7-BA27-4540-9BCE-45E634DA6035} = {A8ED4215-E7B8-4F14-B61D-F737E24C856A}
+		{0CA04347-D51A-4F7C-927C-FB45E2B266D8} = {D46042B1-7AEB-4642-8591-E6B3F2E0F1C4}
+		{E118B30B-6805-477B-A402-3DBD66DD619E} = {D46042B1-7AEB-4642-8591-E6B3F2E0F1C4}
+		{D46042B1-7AEB-4642-8591-E6B3F2E0F1C4} = {21D78340-7F96-4519-983F-529077A11AE1}
+		{860E324D-4B26-4F48-B7AC-44EED82A8EA7} = {E8705420-F755-4CBA-970D-B745F59F9780}
+		{E55AA18C-4B27-4C51-976E-0E7DE39F4AFB} = {E8705420-F755-4CBA-970D-B745F59F9780}
+		{E8705420-F755-4CBA-970D-B745F59F9780} = {21D78340-7F96-4519-983F-529077A11AE1}
+		{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C} = {CDD72541-F0ED-41FA-9C9A-5D774CEB22E4}
+		{CDD72541-F0ED-41FA-9C9A-5D774CEB22E4} = {21D78340-7F96-4519-983F-529077A11AE1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {158060A0-BFF9-48E6-90A9-93F52FEB5D3B}
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 297898f5bc4a5..2ec3fdd279e4f 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
@@ -35,6 +35,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.ReaderWriter", "..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj", "{391A8D1B-A44C-44C3-AFCF-045EE81FDFD2}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{3FBD947C-3755-4DFE-A1E8-76617C11FE78}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{6C2C3949-60D3-45C4-BCE5-38C33E4F818E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{376DF098-A8D4-44F9-914F-BAD5F233703B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{4C51C8CA-8E6E-4B34-98D5-83097DA41379}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{50D92962-8C6F-4240-A325-8A46F08D71BA}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{23D70080-2668-4963-A7A0-4E5FC4CE7464}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A5940D03-8A5D-494C-B87F-4B9AAB6B21AE}"
@@ -43,6 +53,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A408DA52-13D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BD161CEF-9B1C-45C0-B541-E4BA194BFCEC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{5F8E719B-9F8B-4797-B30D-91D55B7DF40E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{0209E962-B0AA-4D82-BE17-4C98EDE738E8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{D357AF18-41DA-43F9-92D7-D52D43E7DA35}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{3A08C218-12F3-47EC-B4F3-BC3A0650ABB2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -121,6 +139,26 @@ Global
 		{391A8D1B-A44C-44C3-AFCF-045EE81FDFD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{391A8D1B-A44C-44C3-AFCF-045EE81FDFD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{391A8D1B-A44C-44C3-AFCF-045EE81FDFD2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3FBD947C-3755-4DFE-A1E8-76617C11FE78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FBD947C-3755-4DFE-A1E8-76617C11FE78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FBD947C-3755-4DFE-A1E8-76617C11FE78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3FBD947C-3755-4DFE-A1E8-76617C11FE78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C2C3949-60D3-45C4-BCE5-38C33E4F818E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C2C3949-60D3-45C4-BCE5-38C33E4F818E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C2C3949-60D3-45C4-BCE5-38C33E4F818E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C2C3949-60D3-45C4-BCE5-38C33E4F818E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{376DF098-A8D4-44F9-914F-BAD5F233703B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{376DF098-A8D4-44F9-914F-BAD5F233703B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{376DF098-A8D4-44F9-914F-BAD5F233703B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{376DF098-A8D4-44F9-914F-BAD5F233703B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C51C8CA-8E6E-4B34-98D5-83097DA41379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C51C8CA-8E6E-4B34-98D5-83097DA41379}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C51C8CA-8E6E-4B34-98D5-83097DA41379}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C51C8CA-8E6E-4B34-98D5-83097DA41379}.Release|Any CPU.Build.0 = Release|Any CPU
+		{50D92962-8C6F-4240-A325-8A46F08D71BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50D92962-8C6F-4240-A325-8A46F08D71BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50D92962-8C6F-4240-A325-8A46F08D71BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50D92962-8C6F-4240-A325-8A46F08D71BA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -144,6 +182,14 @@ Global
 		{B5544BD7-96BD-47E8-A27A-F18D42B44D7B} = {BD161CEF-9B1C-45C0-B541-E4BA194BFCEC}
 		{2D7FD180-D8EE-48B5-B71D-1AE8DEAB1F37} = {BD161CEF-9B1C-45C0-B541-E4BA194BFCEC}
 		{DBE877DF-486A-417B-9A4A-F25156621203} = {BD161CEF-9B1C-45C0-B541-E4BA194BFCEC}
+		{3FBD947C-3755-4DFE-A1E8-76617C11FE78} = {5F8E719B-9F8B-4797-B30D-91D55B7DF40E}
+		{6C2C3949-60D3-45C4-BCE5-38C33E4F818E} = {5F8E719B-9F8B-4797-B30D-91D55B7DF40E}
+		{5F8E719B-9F8B-4797-B30D-91D55B7DF40E} = {3A08C218-12F3-47EC-B4F3-BC3A0650ABB2}
+		{376DF098-A8D4-44F9-914F-BAD5F233703B} = {0209E962-B0AA-4D82-BE17-4C98EDE738E8}
+		{4C51C8CA-8E6E-4B34-98D5-83097DA41379} = {0209E962-B0AA-4D82-BE17-4C98EDE738E8}
+		{0209E962-B0AA-4D82-BE17-4C98EDE738E8} = {3A08C218-12F3-47EC-B4F3-BC3A0650ABB2}
+		{50D92962-8C6F-4240-A325-8A46F08D71BA} = {D357AF18-41DA-43F9-92D7-D52D43E7DA35}
+		{D357AF18-41DA-43F9-92D7-D52D43E7DA35} = {3A08C218-12F3-47EC-B4F3-BC3A0650ABB2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5D066F36-FE2F-41D2-A586-BBA5192A8BCA}
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 c1bdfe002453b..82ad064599893 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
@@ -13,6 +13,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serializatio
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{2D875658-E9BD-42DE-98E2-C8C6F1D914B3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{3F9FDFD9-20A0-4339-A6E9-4C5EE37FE8F7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{F45FC657-65C9-434C-BBA9-705659BC706D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{BB531320-C354-40C5-851D-19C53FA2C8D7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{0B85B404-0EA3-4A29-8F8B-08BACEB0CA87}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{3400A481-1530-48A7-887C-1C2B0ED3D229}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8197F6DC-718C-4F71-9F13-771B1C1058E1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A1607D7B-AA96-4EAD-99F7-9CA09E472C56}"
@@ -21,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E8F4D65F-BB0
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{39E6C76D-0897-4933-81F5-107D9947D90D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{ADD5C251-5813-4F1D-A954-4C5B87A40C4B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{2C7D4E4D-38B6-48D8-8E4A-FA97B478F55E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{51D4A91D-EE9F-423F-8D75-76AB3E5E9330}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{AE59DF5D-1970-4F08-8F45-9F4A9D261820}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +73,26 @@ Global
 		{2D875658-E9BD-42DE-98E2-C8C6F1D914B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2D875658-E9BD-42DE-98E2-C8C6F1D914B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2D875658-E9BD-42DE-98E2-C8C6F1D914B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F9FDFD9-20A0-4339-A6E9-4C5EE37FE8F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F9FDFD9-20A0-4339-A6E9-4C5EE37FE8F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F9FDFD9-20A0-4339-A6E9-4C5EE37FE8F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F9FDFD9-20A0-4339-A6E9-4C5EE37FE8F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F45FC657-65C9-434C-BBA9-705659BC706D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F45FC657-65C9-434C-BBA9-705659BC706D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F45FC657-65C9-434C-BBA9-705659BC706D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F45FC657-65C9-434C-BBA9-705659BC706D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB531320-C354-40C5-851D-19C53FA2C8D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB531320-C354-40C5-851D-19C53FA2C8D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB531320-C354-40C5-851D-19C53FA2C8D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB531320-C354-40C5-851D-19C53FA2C8D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B85B404-0EA3-4A29-8F8B-08BACEB0CA87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B85B404-0EA3-4A29-8F8B-08BACEB0CA87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B85B404-0EA3-4A29-8F8B-08BACEB0CA87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B85B404-0EA3-4A29-8F8B-08BACEB0CA87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3400A481-1530-48A7-887C-1C2B0ED3D229}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3400A481-1530-48A7-887C-1C2B0ED3D229}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3400A481-1530-48A7-887C-1C2B0ED3D229}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3400A481-1530-48A7-887C-1C2B0ED3D229}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -67,6 +105,14 @@ Global
 		{9F0F182E-71C9-4CB5-8E5E-94AFEE489B1D} = {E8F4D65F-BB03-4954-AB19-C85DEC5E286C}
 		{2D875658-E9BD-42DE-98E2-C8C6F1D914B3} = {E8F4D65F-BB03-4954-AB19-C85DEC5E286C}
 		{70F6A111-C73E-4989-BCE4-ED790E1E2882} = {39E6C76D-0897-4933-81F5-107D9947D90D}
+		{3F9FDFD9-20A0-4339-A6E9-4C5EE37FE8F7} = {ADD5C251-5813-4F1D-A954-4C5B87A40C4B}
+		{F45FC657-65C9-434C-BBA9-705659BC706D} = {ADD5C251-5813-4F1D-A954-4C5B87A40C4B}
+		{ADD5C251-5813-4F1D-A954-4C5B87A40C4B} = {AE59DF5D-1970-4F08-8F45-9F4A9D261820}
+		{BB531320-C354-40C5-851D-19C53FA2C8D7} = {2C7D4E4D-38B6-48D8-8E4A-FA97B478F55E}
+		{0B85B404-0EA3-4A29-8F8B-08BACEB0CA87} = {2C7D4E4D-38B6-48D8-8E4A-FA97B478F55E}
+		{2C7D4E4D-38B6-48D8-8E4A-FA97B478F55E} = {AE59DF5D-1970-4F08-8F45-9F4A9D261820}
+		{3400A481-1530-48A7-887C-1C2B0ED3D229} = {51D4A91D-EE9F-423F-8D75-76AB3E5E9330}
+		{51D4A91D-EE9F-423F-8D75-76AB3E5E9330} = {AE59DF5D-1970-4F08-8F45-9F4A9D261820}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7BC9AD65-7DA0-465C-B6FF-6037B3A864CD}
diff --git a/src/libraries/System.Runtime.Serialization.Schema/System.Runtime.Serialization.Schema.sln b/src/libraries/System.Runtime.Serialization.Schema/System.Runtime.Serialization.Schema.sln
index 98fb9f98241db..9774aceb3c60c 100644
--- a/src/libraries/System.Runtime.Serialization.Schema/System.Runtime.Serialization.Schema.sln
+++ b/src/libraries/System.Runtime.Serialization.Schema/System.Runtime.Serialization.Schema.sln
@@ -5,8 +5,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom", "..\System
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom", "..\System.CodeDom\src\System.CodeDom.csproj", "{D9B2FAA2-5A60-4650-B40F-780BC25CB603}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{01B58545-AF7A-4D58-AE7F-BCE16E68A975}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{222716D5-754B-4C1D-A5F9-1BD0692E843C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{F73066DB-FD20-4C3B-B837-0FB18BDBF0B5}"
@@ -17,6 +15,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serializatio
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Schema.Tests", "tests\System.Runtime.Serialization.Schema.Tests.csproj", "{627FFEFC-A317-4AD1-809F-B26CA7F475BD}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{7D895D9D-87EE-4ACE-B1EE-4F67036EA750}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{3089FA98-1357-400A-94C2-40CC3D6603AD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{FA098A6B-2B60-4343-BC42-99E0FD6B2AEC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{C4D63410-3D2E-44E0-A660-53D9CB90086E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{B38AD6B0-656D-42A2-8B4C-2B24E34E8CC3}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2D7D470B-B092-45BC-900A-CDB20CA94BE7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{54321C0F-1323-4962-A01C-AC07028C3FA8}"
@@ -25,6 +33,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6591788E-089
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{366E690D-4016-43C9-9E9C-1B989A1E78A2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{E12A010F-9B8A-4446-BCF1-9359EFA1F626}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{5DD8EAFA-CD9C-4FAD-A690-7937F75991C0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{BD11F34C-1D19-4FC6-8498-44AD2DD284CF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{ECEAEC84-7D2B-468E-A410-864D03036A0F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{D9B2FAA2-5A60-4650-B40F-780BC25CB603}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9B2FAA2-5A60-4650-B40F-780BC25CB603}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9B2FAA2-5A60-4650-B40F-780BC25CB603}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01B58545-AF7A-4D58-AE7F-BCE16E68A975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01B58545-AF7A-4D58-AE7F-BCE16E68A975}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01B58545-AF7A-4D58-AE7F-BCE16E68A975}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01B58545-AF7A-4D58-AE7F-BCE16E68A975}.Release|Any CPU.Build.0 = Release|Any CPU
 		{222716D5-754B-4C1D-A5F9-1BD0692E843C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{222716D5-754B-4C1D-A5F9-1BD0692E843C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{222716D5-754B-4C1D-A5F9-1BD0692E843C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -67,6 +79,26 @@ Global
 		{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
+		{7D895D9D-87EE-4ACE-B1EE-4F67036EA750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D895D9D-87EE-4ACE-B1EE-4F67036EA750}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D895D9D-87EE-4ACE-B1EE-4F67036EA750}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D895D9D-87EE-4ACE-B1EE-4F67036EA750}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3089FA98-1357-400A-94C2-40CC3D6603AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3089FA98-1357-400A-94C2-40CC3D6603AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3089FA98-1357-400A-94C2-40CC3D6603AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3089FA98-1357-400A-94C2-40CC3D6603AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA098A6B-2B60-4343-BC42-99E0FD6B2AEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA098A6B-2B60-4343-BC42-99E0FD6B2AEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA098A6B-2B60-4343-BC42-99E0FD6B2AEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA098A6B-2B60-4343-BC42-99E0FD6B2AEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4D63410-3D2E-44E0-A660-53D9CB90086E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4D63410-3D2E-44E0-A660-53D9CB90086E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4D63410-3D2E-44E0-A660-53D9CB90086E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4D63410-3D2E-44E0-A660-53D9CB90086E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B38AD6B0-656D-42A2-8B4C-2B24E34E8CC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B38AD6B0-656D-42A2-8B4C-2B24E34E8CC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B38AD6B0-656D-42A2-8B4C-2B24E34E8CC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B38AD6B0-656D-42A2-8B4C-2B24E34E8CC3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -78,9 +110,16 @@ Global
 		{74AE27CF-E940-4EEB-9A19-0968689B627E} = {54321C0F-1323-4962-A01C-AC07028C3FA8}
 		{D9B2FAA2-5A60-4650-B40F-780BC25CB603} = {6591788E-0894-4655-AE2F-602407C4F766}
 		{14D5A803-D5BF-44E5-B2B5-0B0BC297748E} = {6591788E-0894-4655-AE2F-602407C4F766}
-		{01B58545-AF7A-4D58-AE7F-BCE16E68A975} = {366E690D-4016-43C9-9E9C-1B989A1E78A2}
 		{222716D5-754B-4C1D-A5F9-1BD0692E843C} = {366E690D-4016-43C9-9E9C-1B989A1E78A2}
 		{F73066DB-FD20-4C3B-B837-0FB18BDBF0B5} = {366E690D-4016-43C9-9E9C-1B989A1E78A2}
+		{7D895D9D-87EE-4ACE-B1EE-4F67036EA750} = {E12A010F-9B8A-4446-BCF1-9359EFA1F626}
+		{3089FA98-1357-400A-94C2-40CC3D6603AD} = {E12A010F-9B8A-4446-BCF1-9359EFA1F626}
+		{E12A010F-9B8A-4446-BCF1-9359EFA1F626} = {ECEAEC84-7D2B-468E-A410-864D03036A0F}
+		{FA098A6B-2B60-4343-BC42-99E0FD6B2AEC} = {5DD8EAFA-CD9C-4FAD-A690-7937F75991C0}
+		{C4D63410-3D2E-44E0-A660-53D9CB90086E} = {5DD8EAFA-CD9C-4FAD-A690-7937F75991C0}
+		{5DD8EAFA-CD9C-4FAD-A690-7937F75991C0} = {ECEAEC84-7D2B-468E-A410-864D03036A0F}
+		{B38AD6B0-656D-42A2-8B4C-2B24E34E8CC3} = {BD11F34C-1D19-4FC6-8498-44AD2DD284CF}
+		{BD11F34C-1D19-4FC6-8498-44AD2DD284CF} = {ECEAEC84-7D2B-468E-A410-864D03036A0F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {70EC5780-3C80-4D52-93B0-7FBF64E29572}
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 e2ae0abfbf2f3..e0f6bce995931 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
@@ -3,6 +3,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Primitives", "..\Microsoft.Win32.Primitives\ref\Microsoft.Win32.Primitives.csproj", "{E5DB95E1-94AA-405C-9FFE-09B1E2498EE2}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SerializableAssembly", "..\Microsoft.XmlSerializer.Generator\tests\SerializableAssembly.csproj", "{55221476-F11B-469E-AD3C-CEB038316A52}"
+EndProject
 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.CodeDom", "..\System.CodeDom\src\System.CodeDom.csproj", "{1392041A-E2CA-4553-BEAF-363974651B81}"
@@ -15,8 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives", "..
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.DataContractSerialization", "..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj", "{76AC3DDD-2B38-489F-A8B0-8E43054595DB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{4C32D611-D0B9-4E91-A626-3DF43BE974CB}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{7D7457FD-B88C-4375-926D-7D46C71E34A7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D5FF2DBA-F304-4ACB-8F82-B8F9321E22A9}"
@@ -41,6 +41,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.ReaderWriter", "..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj", "{DF2255F4-F671-4C15-9100-D8079992E19D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{E2DF066F-C124-440F-999A-A71F71C7F34E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{AC9A8A75-D385-4871-9FA9-5BB324F854AB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{696F540B-36CF-4402-84AA-1AB53FC05850}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{855AACC7-1EA3-4E33-9EBE-474A71BC03FA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A59A0894-0AAE-4EEE-A2A6-494B3983DE7E}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{41101B02-36C9-476B-98D5-1A6E105BBF4A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{18E62E91-73A2-48AE-BEFF-CE7C64DF759D}"
@@ -49,6 +59,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DB29DBEF-FA4
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{DE71D38E-4154-477C-9C27-3FA4ADB4098F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{A980EC85-6DBA-4AA8-A2E9-8B596010795D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{C7960E25-4291-47E0-AC00-683809D40322}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{F5B9DBD0-A90F-4F5A-94E1-EC68D2F5991F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{37EB5E8F-8F0C-4BF8-B790-004EC32D940A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -63,6 +81,10 @@ Global
 		{E5DB95E1-94AA-405C-9FFE-09B1E2498EE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E5DB95E1-94AA-405C-9FFE-09B1E2498EE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5DB95E1-94AA-405C-9FFE-09B1E2498EE2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55221476-F11B-469E-AD3C-CEB038316A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55221476-F11B-469E-AD3C-CEB038316A52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55221476-F11B-469E-AD3C-CEB038316A52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55221476-F11B-469E-AD3C-CEB038316A52}.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
@@ -87,10 +109,6 @@ Global
 		{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
-		{4C32D611-D0B9-4E91-A626-3DF43BE974CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C32D611-D0B9-4E91-A626-3DF43BE974CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C32D611-D0B9-4E91-A626-3DF43BE974CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C32D611-D0B9-4E91-A626-3DF43BE974CB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7D7457FD-B88C-4375-926D-7D46C71E34A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7D7457FD-B88C-4375-926D-7D46C71E34A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7D7457FD-B88C-4375-926D-7D46C71E34A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -139,12 +157,33 @@ Global
 		{DF2255F4-F671-4C15-9100-D8079992E19D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DF2255F4-F671-4C15-9100-D8079992E19D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF2255F4-F671-4C15-9100-D8079992E19D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2DF066F-C124-440F-999A-A71F71C7F34E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2DF066F-C124-440F-999A-A71F71C7F34E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2DF066F-C124-440F-999A-A71F71C7F34E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2DF066F-C124-440F-999A-A71F71C7F34E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC9A8A75-D385-4871-9FA9-5BB324F854AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC9A8A75-D385-4871-9FA9-5BB324F854AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC9A8A75-D385-4871-9FA9-5BB324F854AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC9A8A75-D385-4871-9FA9-5BB324F854AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{696F540B-36CF-4402-84AA-1AB53FC05850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{696F540B-36CF-4402-84AA-1AB53FC05850}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{696F540B-36CF-4402-84AA-1AB53FC05850}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{696F540B-36CF-4402-84AA-1AB53FC05850}.Release|Any CPU.Build.0 = Release|Any CPU
+		{855AACC7-1EA3-4E33-9EBE-474A71BC03FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{855AACC7-1EA3-4E33-9EBE-474A71BC03FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{855AACC7-1EA3-4E33-9EBE-474A71BC03FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{855AACC7-1EA3-4E33-9EBE-474A71BC03FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A59A0894-0AAE-4EEE-A2A6-494B3983DE7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A59A0894-0AAE-4EEE-A2A6-494B3983DE7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A59A0894-0AAE-4EEE-A2A6-494B3983DE7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A59A0894-0AAE-4EEE-A2A6-494B3983DE7E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{CBA80130-6773-4DF9-995C-DC6CBED89CB5} = {41101B02-36C9-476B-98D5-1A6E105BBF4A}
+		{55221476-F11B-469E-AD3C-CEB038316A52} = {41101B02-36C9-476B-98D5-1A6E105BBF4A}
 		{8B069551-9B95-464E-BB40-C56817506FEC} = {41101B02-36C9-476B-98D5-1A6E105BBF4A}
 		{8FF5E841-29F6-4DB7-A4F8-9281FBDA0B9C} = {41101B02-36C9-476B-98D5-1A6E105BBF4A}
 		{45263D7D-249E-4810-8F7D-1DEF25515210} = {41101B02-36C9-476B-98D5-1A6E105BBF4A}
@@ -161,10 +200,17 @@ Global
 		{1392041A-E2CA-4553-BEAF-363974651B81} = {DB29DBEF-FA4E-4334-AFB8-BFB2DA82D1DE}
 		{76AC3DDD-2B38-489F-A8B0-8E43054595DB} = {DB29DBEF-FA4E-4334-AFB8-BFB2DA82D1DE}
 		{6FD10BE0-24C8-456E-8B9A-FD101C05C961} = {DB29DBEF-FA4E-4334-AFB8-BFB2DA82D1DE}
-		{4C32D611-D0B9-4E91-A626-3DF43BE974CB} = {DE71D38E-4154-477C-9C27-3FA4ADB4098F}
 		{7D7457FD-B88C-4375-926D-7D46C71E34A7} = {DE71D38E-4154-477C-9C27-3FA4ADB4098F}
 		{D5FF2DBA-F304-4ACB-8F82-B8F9321E22A9} = {DE71D38E-4154-477C-9C27-3FA4ADB4098F}
 		{6E942A4A-405E-4AAD-89A7-006358A8A004} = {DE71D38E-4154-477C-9C27-3FA4ADB4098F}
+		{E2DF066F-C124-440F-999A-A71F71C7F34E} = {A980EC85-6DBA-4AA8-A2E9-8B596010795D}
+		{AC9A8A75-D385-4871-9FA9-5BB324F854AB} = {A980EC85-6DBA-4AA8-A2E9-8B596010795D}
+		{A980EC85-6DBA-4AA8-A2E9-8B596010795D} = {37EB5E8F-8F0C-4BF8-B790-004EC32D940A}
+		{696F540B-36CF-4402-84AA-1AB53FC05850} = {C7960E25-4291-47E0-AC00-683809D40322}
+		{855AACC7-1EA3-4E33-9EBE-474A71BC03FA} = {C7960E25-4291-47E0-AC00-683809D40322}
+		{C7960E25-4291-47E0-AC00-683809D40322} = {37EB5E8F-8F0C-4BF8-B790-004EC32D940A}
+		{A59A0894-0AAE-4EEE-A2A6-494B3983DE7E} = {F5B9DBD0-A90F-4F5A-94E1-EC68D2F5991F}
+		{F5B9DBD0-A90F-4F5A-94E1-EC68D2F5991F} = {37EB5E8F-8F0C-4BF8-B790-004EC32D940A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EE9FB522-4B73-4E3E-B63D-C21826BB7B5D}
diff --git a/src/libraries/System.Runtime/System.Runtime.sln b/src/libraries/System.Runtime/System.Runtime.sln
index a7d50d4a347ab..62431149c3fb7 100644
--- a/src/libraries/System.Runtime/System.Runtime.sln
+++ b/src/libraries/System.Runtime/System.Runtime.sln
@@ -7,14 +7,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities.Unicode", "..
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{FB17AC52-1633-4845-932B-9218DF895957}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{21791340-49C4-4C07-97FD-CAA1B72D3256}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{CF79B5AE-38CB-4B80-BF92-CF634C0B7EC3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{E64D31D0-8F38-4FDF-B60D-F955D2475566}"
 EndProject
 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}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{A7B7DE04-7261-4D4C-AA78-9F2D9B5A1C37}"
@@ -23,6 +23,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "ref\Syste
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "src\System.Runtime.csproj", "{A83A8520-F5E2-49B4-83BC-0F82A412951D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.IOS.Tests", "tests\Hybrid\System.Runtime.IOS.Tests.csproj", "{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Nls.Tests", "tests\NlsTests\System.Runtime.Nls.Tests.csproj", "{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Tests", "tests\System.Runtime.Tests.csproj", "{4EE36055-AD7C-4779-B3F6-08687960DCC3}"
@@ -43,8 +45,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{F6A8185B-07C6-401D-9B40-3C560239E05F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Generator", "..\System.Text.RegularExpressions\gen\System.Text.RegularExpressions.Generator.csproj", "{EC777939-BE30-4ED9-9FE1-451DD7472467}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\ref\System.Threading.AccessControl.csproj", "{25E8AB9D-2D10-44F5-9F83-5A5134526771}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\src\System.Threading.AccessControl.csproj", "{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}"
@@ -53,14 +53,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{28140562-A65A-48E9-ABAB-53BA939084F0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{4CBDF585-FD15-44E9-9795-1BED79BC4960}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{AF7CC240-B4D5-4C37-9B04-473CBCC52330}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{5B542214-BAF3-4FA7-8424-D0E9C631A2E9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FD72C125-C10D-457B-8AFC-6B4E5237AF6A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{28140562-A65A-48E9-ABAB-53BA939084F0}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F362E63A-2B1A-445B-B198-3071D7DDE8CF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5B2B5E7E-A2FB-4095-9E79-404BF53E0133}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{13818769-DC01-4715-9590-E000D03E42A9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{04D0E381-5B43-42C0-8E08-FADBFCECB353}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{F65030D7-DDBD-4D4C-B6E3-D3C0DD7FD569}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{67DCB1C2-0B95-40B6-ACE8-9812BF57EB19}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -173,6 +193,27 @@ Global
 		{FB17AC52-1633-4845-932B-9218DF895957}.Checked|arm64.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
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Debug|x64.Build.0 = Debug|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Debug|x86.Build.0 = Debug|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Release|arm.ActiveCfg = Release|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Release|arm64.ActiveCfg = Release|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Release|x64.ActiveCfg = Release|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Release|x64.Build.0 = Release|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Release|x86.ActiveCfg = Release|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Release|x86.Build.0 = Release|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{21791340-49C4-4C07-97FD-CAA1B72D3256}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{CF79B5AE-38CB-4B80-BF92-CF634C0B7EC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CF79B5AE-38CB-4B80-BF92-CF634C0B7EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CF79B5AE-38CB-4B80-BF92-CF634C0B7EC3}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -236,27 +277,6 @@ Global
 		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Checked|arm64.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
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Debug|arm.ActiveCfg = Debug|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Debug|x64.Build.0 = Debug|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Debug|x86.Build.0 = Debug|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Release|arm.ActiveCfg = Release|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Release|x64.ActiveCfg = Release|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Release|x64.Build.0 = Release|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Release|x86.ActiveCfg = Release|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Release|x86.Build.0 = Release|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -341,6 +361,27 @@ Global
 		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Checked|arm64.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
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Debug|x64.Build.0 = Debug|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Debug|x86.Build.0 = Debug|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Release|arm.ActiveCfg = Release|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Release|x64.ActiveCfg = Release|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Release|x64.Build.0 = Release|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Release|x86.ActiveCfg = Release|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Release|x86.Build.0 = Release|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C}.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|arm.ActiveCfg = Debug|Any CPU
@@ -551,27 +592,6 @@ Global
 		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Checked|arm64.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
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Debug|arm.ActiveCfg = Debug|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Debug|x64.Build.0 = Debug|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Debug|x86.Build.0 = Debug|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Release|arm.ActiveCfg = Release|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Release|arm64.ActiveCfg = Release|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Release|x64.ActiveCfg = Release|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Release|x64.Build.0 = Release|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Release|x86.ActiveCfg = Release|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Release|x86.Build.0 = Release|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Checked|arm.ActiveCfg = Debug|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Checked|arm64.ActiveCfg = Debug|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{EC777939-BE30-4ED9-9FE1-451DD7472467}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{25E8AB9D-2D10-44F5-9F83-5A5134526771}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25E8AB9D-2D10-44F5-9F83-5A5134526771}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25E8AB9D-2D10-44F5-9F83-5A5134526771}.Debug|arm.ActiveCfg = Debug|Any CPU
@@ -656,20 +676,121 @@ Global
 		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Checked|arm64.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
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Debug|x64.Build.0 = Debug|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Debug|x86.Build.0 = Debug|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Release|arm.ActiveCfg = Release|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Release|x64.ActiveCfg = Release|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Release|x64.Build.0 = Release|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Release|x86.ActiveCfg = Release|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Release|x86.Build.0 = Release|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Debug|x64.Build.0 = Debug|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Debug|x86.Build.0 = Debug|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Release|arm.ActiveCfg = Release|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Release|x64.ActiveCfg = Release|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Release|x64.Build.0 = Release|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Release|x86.ActiveCfg = Release|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Release|x86.Build.0 = Release|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Debug|x64.Build.0 = Debug|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Debug|x86.Build.0 = Debug|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Release|arm.ActiveCfg = Release|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Release|x64.ActiveCfg = Release|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Release|x64.Build.0 = Release|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Release|x86.ActiveCfg = Release|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Release|x86.Build.0 = Release|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Debug|x64.Build.0 = Debug|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Debug|x86.Build.0 = Debug|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Release|arm.ActiveCfg = Release|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Release|arm64.ActiveCfg = Release|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Release|x64.ActiveCfg = Release|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Release|x64.Build.0 = Release|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Release|x86.ActiveCfg = Release|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Release|x86.Build.0 = Release|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Debug|x64.Build.0 = Debug|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Debug|x86.Build.0 = Debug|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Release|arm.ActiveCfg = Release|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Release|arm64.ActiveCfg = Release|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Release|x64.ActiveCfg = Release|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Release|x64.Build.0 = Release|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Release|x86.ActiveCfg = Release|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Release|x86.Build.0 = Release|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9} = {28140562-A65A-48E9-ABAB-53BA939084F0}
-		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC} = {28140562-A65A-48E9-ABAB-53BA939084F0}
-		{A83A8520-F5E2-49B4-83BC-0F82A412951D} = {28140562-A65A-48E9-ABAB-53BA939084F0}
-		{F6A8185B-07C6-401D-9B40-3C560239E05F} = {28140562-A65A-48E9-ABAB-53BA939084F0}
-		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13} = {28140562-A65A-48E9-ABAB-53BA939084F0}
-		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9} = {5B542214-BAF3-4FA7-8424-D0E9C631A2E9}
 		{AF7BA66D-EA0E-4755-8DA8-4CFE9B935F83} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{FB17AC52-1633-4845-932B-9218DF895957} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{43C40A0B-0B0E-4D27-8534-11CD5A540F7C} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{4EE36055-AD7C-4779-B3F6-08687960DCC3} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{C3F25EEF-04B4-407A-960B-0C1CE9C04430} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
@@ -678,16 +799,28 @@ Global
 		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
 		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+		{21791340-49C4-4C07-97FD-CAA1B72D3256} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+		{F6A8185B-07C6-401D-9B40-3C560239E05F} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA} = {28140562-A65A-48E9-ABAB-53BA939084F0}
 		{CF79B5AE-38CB-4B80-BF92-CF634C0B7EC3} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
-		{5DB600A4-08C4-485B-A1D5-E4A4C593FB0E} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
 		{4FA4A9A6-1D38-414B-96F0-3CFB63C687C9} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
 		{A7B7DE04-7261-4D4C-AA78-9F2D9B5A1C37} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
-		{EC777939-BE30-4ED9-9FE1-451DD7472467} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
 		{E64D31D0-8F38-4FDF-B60D-F955D2475566} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
 		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
 		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
 		{25E8AB9D-2D10-44F5-9F83-5A5134526771} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
 		{82728202-1098-4E16-B598-5762EAF67D08} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
+		{CFAB1236-51C3-4A13-A57F-16022FD0A7EE} = {13818769-DC01-4715-9590-E000D03E42A9}
+		{4CBDF585-FD15-44E9-9795-1BED79BC4960} = {13818769-DC01-4715-9590-E000D03E42A9}
+		{13818769-DC01-4715-9590-E000D03E42A9} = {67DCB1C2-0B95-40B6-ACE8-9812BF57EB19}
+		{1CBBF9E2-4EBD-40F0-BB9E-66BCE3CA5AA8} = {04D0E381-5B43-42C0-8E08-FADBFCECB353}
+		{AF7CC240-B4D5-4C37-9B04-473CBCC52330} = {04D0E381-5B43-42C0-8E08-FADBFCECB353}
+		{04D0E381-5B43-42C0-8E08-FADBFCECB353} = {67DCB1C2-0B95-40B6-ACE8-9812BF57EB19}
+		{3F5ABC5D-42DE-44C4-BEFC-741F4974C744} = {F65030D7-DDBD-4D4C-B6E3-D3C0DD7FD569}
+		{F65030D7-DDBD-4D4C-B6E3-D3C0DD7FD569} = {67DCB1C2-0B95-40B6-ACE8-9812BF57EB19}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {19706846-1F47-42ED-B649-B0982EE96E6B}
diff --git a/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln b/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln
index 3f128cecb6ae5..4a8661378ce81 100644
--- a/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln
+++ b/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln
@@ -25,6 +25,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims", ".
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{2593060B-10ED-40C1-8943-3C016EFD8928}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{81E36AA4-93BB-4BB9-9AB5-C8BBAE2FD7C3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{FF6004AA-C38E-4083-80CC-D6515A41937E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{68A0DB6E-97AB-433F-8FE0-30CDAB9E0E3C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{EF1F5D22-5888-4C65-881D-FA34D5A1C9FB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{45611BC7-50D2-42A9-BA9C-94DA5ADA3994}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4ED5729F-DB06-4332-9876-354C28894824}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BF0DEEC5-58A6-4156-B44B-E3C248A01523}"
@@ -33,6 +43,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5A0B73BB-E1B
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{82996086-0F1B-4E0F-9121-07C396EF0EC7}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{E740D6D1-02CB-4842-A440-025C08D5BFB1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{1119205E-8DB4-4506-A47E-309F63443E09}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{25F0BAE7-C932-46B3-8E5C-64759A0B2B2F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{78FAC980-2414-44E2-BED7-322089791D13}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,6 +109,26 @@ Global
 		{2593060B-10ED-40C1-8943-3C016EFD8928}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2593060B-10ED-40C1-8943-3C016EFD8928}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2593060B-10ED-40C1-8943-3C016EFD8928}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81E36AA4-93BB-4BB9-9AB5-C8BBAE2FD7C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81E36AA4-93BB-4BB9-9AB5-C8BBAE2FD7C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81E36AA4-93BB-4BB9-9AB5-C8BBAE2FD7C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81E36AA4-93BB-4BB9-9AB5-C8BBAE2FD7C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FF6004AA-C38E-4083-80CC-D6515A41937E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF6004AA-C38E-4083-80CC-D6515A41937E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF6004AA-C38E-4083-80CC-D6515A41937E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF6004AA-C38E-4083-80CC-D6515A41937E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{68A0DB6E-97AB-433F-8FE0-30CDAB9E0E3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68A0DB6E-97AB-433F-8FE0-30CDAB9E0E3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68A0DB6E-97AB-433F-8FE0-30CDAB9E0E3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{68A0DB6E-97AB-433F-8FE0-30CDAB9E0E3C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF1F5D22-5888-4C65-881D-FA34D5A1C9FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF1F5D22-5888-4C65-881D-FA34D5A1C9FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF1F5D22-5888-4C65-881D-FA34D5A1C9FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF1F5D22-5888-4C65-881D-FA34D5A1C9FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45611BC7-50D2-42A9-BA9C-94DA5ADA3994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45611BC7-50D2-42A9-BA9C-94DA5ADA3994}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45611BC7-50D2-42A9-BA9C-94DA5ADA3994}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45611BC7-50D2-42A9-BA9C-94DA5ADA3994}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -109,6 +147,14 @@ Global
 		{3CA4B29C-71BF-4709-8DA4-E1466A80FDB1} = {82996086-0F1B-4E0F-9121-07C396EF0EC7}
 		{AABA6C21-1DC9-471F-979E-F35930A106F3} = {82996086-0F1B-4E0F-9121-07C396EF0EC7}
 		{CDB32066-5BD2-46EB-AFF1-07554FBF6942} = {82996086-0F1B-4E0F-9121-07C396EF0EC7}
+		{81E36AA4-93BB-4BB9-9AB5-C8BBAE2FD7C3} = {E740D6D1-02CB-4842-A440-025C08D5BFB1}
+		{FF6004AA-C38E-4083-80CC-D6515A41937E} = {E740D6D1-02CB-4842-A440-025C08D5BFB1}
+		{E740D6D1-02CB-4842-A440-025C08D5BFB1} = {78FAC980-2414-44E2-BED7-322089791D13}
+		{68A0DB6E-97AB-433F-8FE0-30CDAB9E0E3C} = {1119205E-8DB4-4506-A47E-309F63443E09}
+		{EF1F5D22-5888-4C65-881D-FA34D5A1C9FB} = {1119205E-8DB4-4506-A47E-309F63443E09}
+		{1119205E-8DB4-4506-A47E-309F63443E09} = {78FAC980-2414-44E2-BED7-322089791D13}
+		{45611BC7-50D2-42A9-BA9C-94DA5ADA3994} = {25F0BAE7-C932-46B3-8E5C-64759A0B2B2F}
+		{25F0BAE7-C932-46B3-8E5C-64759A0B2B2F} = {78FAC980-2414-44E2-BED7-322089791D13}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7F4F25A0-74DA-46ED-BC2B-99607E973B0D}
diff --git a/src/libraries/System.Security.Claims/System.Security.Claims.sln b/src/libraries/System.Security.Claims/System.Security.Claims.sln
index 55de2938f02a5..21279bc42e529 100644
--- a/src/libraries/System.Security.Claims/System.Security.Claims.sln
+++ b/src/libraries/System.Security.Claims/System.Security.Claims.sln
@@ -13,6 +13,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims", "s
 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}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{B66A00DC-5203-490F-BA3D-779859BD1731}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{EC9B5E06-F5F4-4F38-8728-8EA4F339C11D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{5F299B9B-5794-4BA6-9F8E-3B6C73DC8D6A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{DD4D0E10-D8F8-4DA8-A68B-98DD46F08E5E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{12282875-3522-4E87-B8EC-1C5DE7D853B6}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{58661765-A62B-4A5F-9950-A56DEFC0CDB0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{66B48EC0-590C-40BD-A4E3-DB7DBA977B47}"
@@ -21,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3B6EF051-7EB
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3D2906A4-D990-48BA-B038-3465E82F36A4}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{6DDCF01C-7689-493C-BB76-B3B084449564}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{1924AF30-E568-4145-A17E-520B08790CC0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{D3B646DF-C332-42CE-B2EA-599008805004}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{3BFB482F-3B47-4A2C-A588-B5325F513DC5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +73,26 @@ Global
 		{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
+		{B66A00DC-5203-490F-BA3D-779859BD1731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B66A00DC-5203-490F-BA3D-779859BD1731}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B66A00DC-5203-490F-BA3D-779859BD1731}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B66A00DC-5203-490F-BA3D-779859BD1731}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC9B5E06-F5F4-4F38-8728-8EA4F339C11D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC9B5E06-F5F4-4F38-8728-8EA4F339C11D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC9B5E06-F5F4-4F38-8728-8EA4F339C11D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC9B5E06-F5F4-4F38-8728-8EA4F339C11D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F299B9B-5794-4BA6-9F8E-3B6C73DC8D6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F299B9B-5794-4BA6-9F8E-3B6C73DC8D6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F299B9B-5794-4BA6-9F8E-3B6C73DC8D6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F299B9B-5794-4BA6-9F8E-3B6C73DC8D6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD4D0E10-D8F8-4DA8-A68B-98DD46F08E5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD4D0E10-D8F8-4DA8-A68B-98DD46F08E5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD4D0E10-D8F8-4DA8-A68B-98DD46F08E5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD4D0E10-D8F8-4DA8-A68B-98DD46F08E5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12282875-3522-4E87-B8EC-1C5DE7D853B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12282875-3522-4E87-B8EC-1C5DE7D853B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12282875-3522-4E87-B8EC-1C5DE7D853B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12282875-3522-4E87-B8EC-1C5DE7D853B6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -67,6 +105,14 @@ Global
 		{DC408DFF-3507-4384-ADC8-5DEB268C71C5} = {3B6EF051-7EB4-454F-ACA8-AEF258B645E4}
 		{DBBE28DA-7239-4C32-8308-2A65C10410DE} = {3B6EF051-7EB4-454F-ACA8-AEF258B645E4}
 		{85FAD30C-2D0C-406D-9F3B-DB7236016CC5} = {3D2906A4-D990-48BA-B038-3465E82F36A4}
+		{B66A00DC-5203-490F-BA3D-779859BD1731} = {6DDCF01C-7689-493C-BB76-B3B084449564}
+		{EC9B5E06-F5F4-4F38-8728-8EA4F339C11D} = {6DDCF01C-7689-493C-BB76-B3B084449564}
+		{6DDCF01C-7689-493C-BB76-B3B084449564} = {3BFB482F-3B47-4A2C-A588-B5325F513DC5}
+		{5F299B9B-5794-4BA6-9F8E-3B6C73DC8D6A} = {1924AF30-E568-4145-A17E-520B08790CC0}
+		{DD4D0E10-D8F8-4DA8-A68B-98DD46F08E5E} = {1924AF30-E568-4145-A17E-520B08790CC0}
+		{1924AF30-E568-4145-A17E-520B08790CC0} = {3BFB482F-3B47-4A2C-A588-B5325F513DC5}
+		{12282875-3522-4E87-B8EC-1C5DE7D853B6} = {D3B646DF-C332-42CE-B2EA-599008805004}
+		{D3B646DF-C332-42CE-B2EA-599008805004} = {3BFB482F-3B47-4A2C-A588-B5325F513DC5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5C5ECBED-DFC4-4727-8DA2-68375AAB996B}
diff --git a/src/libraries/System.Security.Cryptography.Cose/System.Security.Cryptography.Cose.sln b/src/libraries/System.Security.Cryptography.Cose/System.Security.Cryptography.Cose.sln
index 404e79753dd08..7635671370bb0 100644
--- a/src/libraries/System.Security.Cryptography.Cose/System.Security.Cryptography.Cose.sln
+++ b/src/libraries/System.Security.Cryptography.Cose/System.Security.Cryptography.Cose.sln
@@ -5,8 +5,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Cbor", "..\S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Cbor", "..\System.Formats.Cbor\src\System.Formats.Cbor.csproj", "{0CB3F6B0-353E-47E4-8A62-AFA6115EF789}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{C9230C7F-6D5A-4A58-9853-04046164541D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{02892B95-D329-4428-B5DC-63AE65D4DB75}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{64D2E763-9717-4CE9-8500-6E6B0CF358F2}"
@@ -17,6 +15,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cose.Tests", "tests\System.Security.Cryptography.Cose.Tests.csproj", "{FFA43FB1-ED48-4105-A518-4D02CE72DB3F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{CB705A03-FEA1-49CB-B761-00C9B0015B3B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{5B5A7E1B-1EB5-448A-A539-22E78C8DCA12}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{28BF0D3B-ECB8-4DBE-A190-AE70C44ACF78}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{1C9A5DB3-06A3-4B1E-88F9-B1F342C6968B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{7315ED81-3BAB-415D-9AB0-B40F23F30484}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9535F590-0F95-4174-BB1E-1A80193CAF55}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5F962CC3-0DD0-4428-9CF4-99035553DB85}"
@@ -25,6 +33,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{29B55087-85A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A1DDBD83-25B1-44F6-93A9-AB27A9710FD6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{2A29EADE-6EC8-4C66-88AF-54848E5DEE49}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{1DECB129-26DD-4778-B9FC-4EFD204610CE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C1450551-6C76-4F7C-BA38-CDA68B1E58A9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{448609E7-CADB-4320-A178-84125537C9CE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{0CB3F6B0-353E-47E4-8A62-AFA6115EF789}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0CB3F6B0-353E-47E4-8A62-AFA6115EF789}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0CB3F6B0-353E-47E4-8A62-AFA6115EF789}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C9230C7F-6D5A-4A58-9853-04046164541D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9230C7F-6D5A-4A58-9853-04046164541D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C9230C7F-6D5A-4A58-9853-04046164541D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C9230C7F-6D5A-4A58-9853-04046164541D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{02892B95-D329-4428-B5DC-63AE65D4DB75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{02892B95-D329-4428-B5DC-63AE65D4DB75}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{02892B95-D329-4428-B5DC-63AE65D4DB75}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -67,6 +79,26 @@ Global
 		{FFA43FB1-ED48-4105-A518-4D02CE72DB3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FFA43FB1-ED48-4105-A518-4D02CE72DB3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FFA43FB1-ED48-4105-A518-4D02CE72DB3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB705A03-FEA1-49CB-B761-00C9B0015B3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB705A03-FEA1-49CB-B761-00C9B0015B3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB705A03-FEA1-49CB-B761-00C9B0015B3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB705A03-FEA1-49CB-B761-00C9B0015B3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B5A7E1B-1EB5-448A-A539-22E78C8DCA12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B5A7E1B-1EB5-448A-A539-22E78C8DCA12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B5A7E1B-1EB5-448A-A539-22E78C8DCA12}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B5A7E1B-1EB5-448A-A539-22E78C8DCA12}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28BF0D3B-ECB8-4DBE-A190-AE70C44ACF78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28BF0D3B-ECB8-4DBE-A190-AE70C44ACF78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28BF0D3B-ECB8-4DBE-A190-AE70C44ACF78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28BF0D3B-ECB8-4DBE-A190-AE70C44ACF78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C9A5DB3-06A3-4B1E-88F9-B1F342C6968B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C9A5DB3-06A3-4B1E-88F9-B1F342C6968B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C9A5DB3-06A3-4B1E-88F9-B1F342C6968B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C9A5DB3-06A3-4B1E-88F9-B1F342C6968B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7315ED81-3BAB-415D-9AB0-B40F23F30484}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7315ED81-3BAB-415D-9AB0-B40F23F30484}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7315ED81-3BAB-415D-9AB0-B40F23F30484}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7315ED81-3BAB-415D-9AB0-B40F23F30484}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -78,9 +110,16 @@ Global
 		{823EE247-FC47-444F-B9A0-32AF146D1789} = {5F962CC3-0DD0-4428-9CF4-99035553DB85}
 		{0CB3F6B0-353E-47E4-8A62-AFA6115EF789} = {29B55087-85A2-4FCE-8303-8EE6B43B0094}
 		{CD19385A-1EDD-45DD-B4E4-BD1F2047BB2B} = {29B55087-85A2-4FCE-8303-8EE6B43B0094}
-		{C9230C7F-6D5A-4A58-9853-04046164541D} = {A1DDBD83-25B1-44F6-93A9-AB27A9710FD6}
 		{02892B95-D329-4428-B5DC-63AE65D4DB75} = {A1DDBD83-25B1-44F6-93A9-AB27A9710FD6}
 		{64D2E763-9717-4CE9-8500-6E6B0CF358F2} = {A1DDBD83-25B1-44F6-93A9-AB27A9710FD6}
+		{CB705A03-FEA1-49CB-B761-00C9B0015B3B} = {2A29EADE-6EC8-4C66-88AF-54848E5DEE49}
+		{5B5A7E1B-1EB5-448A-A539-22E78C8DCA12} = {2A29EADE-6EC8-4C66-88AF-54848E5DEE49}
+		{2A29EADE-6EC8-4C66-88AF-54848E5DEE49} = {448609E7-CADB-4320-A178-84125537C9CE}
+		{28BF0D3B-ECB8-4DBE-A190-AE70C44ACF78} = {1DECB129-26DD-4778-B9FC-4EFD204610CE}
+		{1C9A5DB3-06A3-4B1E-88F9-B1F342C6968B} = {1DECB129-26DD-4778-B9FC-4EFD204610CE}
+		{1DECB129-26DD-4778-B9FC-4EFD204610CE} = {448609E7-CADB-4320-A178-84125537C9CE}
+		{7315ED81-3BAB-415D-9AB0-B40F23F30484} = {C1450551-6C76-4F7C-BA38-CDA68B1E58A9}
+		{C1450551-6C76-4F7C-BA38-CDA68B1E58A9} = {448609E7-CADB-4320-A178-84125537C9CE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {446B8AB2-9ED5-4475-A812-DE12AB4DE665}
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 42bdfcd6ee56a..801f0185a0af1 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
@@ -23,6 +23,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs.Tests", "tests\System.Security.Cryptography.Pkcs.Tests.csproj", "{2C8C1360-AC50-4493-BC0B-950149A875A3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{A02E5C2B-BB8A-45CE-9898-106B3DE4731C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{453347E2-A18B-4233-8546-00411970B16D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{5B6E5617-071B-453C-A36A-E54777EDC9A3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{9521EC76-6BAE-4BE0-90AC-F96A76D6656C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{F2B0ACF2-C204-472B-8442-7174A948E2F4}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{893263F9-1E6A-4C9A-808D-539C399848CF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FD768C8B-9BF1-4F02-A2C4-335B22615763}"
@@ -31,6 +41,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D5B768A4-9BA
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{94B59232-B99C-4224-B3E3-0F3385F06B64}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{C291910F-A44F-4EB0-BFFD-972D92FA632E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{9E3DF5A9-98B7-4CA1-8FB6-A5E40440FEFA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{65D63FA6-A758-4FFD-A547-3E3FAF614532}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{CDC00C1E-F192-41D3-9332-C22D88B915D4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -85,6 +103,26 @@ Global
 		{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
+		{A02E5C2B-BB8A-45CE-9898-106B3DE4731C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A02E5C2B-BB8A-45CE-9898-106B3DE4731C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A02E5C2B-BB8A-45CE-9898-106B3DE4731C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A02E5C2B-BB8A-45CE-9898-106B3DE4731C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{453347E2-A18B-4233-8546-00411970B16D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{453347E2-A18B-4233-8546-00411970B16D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{453347E2-A18B-4233-8546-00411970B16D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{453347E2-A18B-4233-8546-00411970B16D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B6E5617-071B-453C-A36A-E54777EDC9A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B6E5617-071B-453C-A36A-E54777EDC9A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B6E5617-071B-453C-A36A-E54777EDC9A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B6E5617-071B-453C-A36A-E54777EDC9A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9521EC76-6BAE-4BE0-90AC-F96A76D6656C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9521EC76-6BAE-4BE0-90AC-F96A76D6656C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9521EC76-6BAE-4BE0-90AC-F96A76D6656C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9521EC76-6BAE-4BE0-90AC-F96A76D6656C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F2B0ACF2-C204-472B-8442-7174A948E2F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2B0ACF2-C204-472B-8442-7174A948E2F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2B0ACF2-C204-472B-8442-7174A948E2F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2B0ACF2-C204-472B-8442-7174A948E2F4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -102,6 +140,14 @@ Global
 		{E44D1459-E2A0-4AF7-A392-1E8F86F64DB5} = {94B59232-B99C-4224-B3E3-0F3385F06B64}
 		{97CE28DB-B4AC-400B-A40D-C55789FCA0AB} = {94B59232-B99C-4224-B3E3-0F3385F06B64}
 		{E44D1E0E-5F76-41B8-AF5F-6112BCC6A39B} = {94B59232-B99C-4224-B3E3-0F3385F06B64}
+		{A02E5C2B-BB8A-45CE-9898-106B3DE4731C} = {C291910F-A44F-4EB0-BFFD-972D92FA632E}
+		{453347E2-A18B-4233-8546-00411970B16D} = {C291910F-A44F-4EB0-BFFD-972D92FA632E}
+		{C291910F-A44F-4EB0-BFFD-972D92FA632E} = {CDC00C1E-F192-41D3-9332-C22D88B915D4}
+		{5B6E5617-071B-453C-A36A-E54777EDC9A3} = {9E3DF5A9-98B7-4CA1-8FB6-A5E40440FEFA}
+		{9521EC76-6BAE-4BE0-90AC-F96A76D6656C} = {9E3DF5A9-98B7-4CA1-8FB6-A5E40440FEFA}
+		{9E3DF5A9-98B7-4CA1-8FB6-A5E40440FEFA} = {CDC00C1E-F192-41D3-9332-C22D88B915D4}
+		{F2B0ACF2-C204-472B-8442-7174A948E2F4} = {65D63FA6-A758-4FFD-A547-3E3FAF614532}
+		{65D63FA6-A758-4FFD-A547-3E3FAF614532} = {CDC00C1E-F192-41D3-9332-C22D88B915D4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CF4AD1E7-1B60-4FDF-894F-7F0EF613012B}
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 930daf90806fc..f3a807ef40796 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,8 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{21CC9F35-ACAA-4452-BE92-BBAE2E927B20}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{F148597E-9706-49BD-ACBC-E18F634B5128}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{324E33F0-53FB-4DFD-AEDF-64BCFB2F7821}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D3B40403-2973-45CE-A0A4-97C38CBE86FE}"
@@ -13,6 +11,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 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}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{0C14D7BC-A21E-46D2-9E1D-F69E52827F00}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{E9D80BF9-DBA6-4130-B5F4-0D5080DD2218}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{2E8D8465-FA66-45C2-A0FF-541D9D8E70EF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{4578FB5F-E69C-4AEF-86F5-FE737E74A324}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{698B4412-560D-4622-9BCE-9021E1303825}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E3C3C868-FBDB-4F07-A72E-F734016C0B3B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6F1E3122-547E-4134-BB45-6E33B880DC34}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AE1B6C0D-299
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{87D86F17-7CEB-48DB-99FB-55922ED2A7D1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{90113343-AD07-450D-B15D-E4E5A8016F60}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{2C7F0705-AF50-4C07-B501-30C2A42C01A5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{358450EF-3CA3-4A72-A60D-98B1988190D2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{306F6193-BC27-4228-B18C-64B1F3CB9CA7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,10 +47,6 @@ Global
 		{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
-		{F148597E-9706-49BD-ACBC-E18F634B5128}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F148597E-9706-49BD-ACBC-E18F634B5128}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F148597E-9706-49BD-ACBC-E18F634B5128}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F148597E-9706-49BD-ACBC-E18F634B5128}.Release|Any CPU.Build.0 = Release|Any CPU
 		{324E33F0-53FB-4DFD-AEDF-64BCFB2F7821}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{324E33F0-53FB-4DFD-AEDF-64BCFB2F7821}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{324E33F0-53FB-4DFD-AEDF-64BCFB2F7821}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{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
+		{0C14D7BC-A21E-46D2-9E1D-F69E52827F00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C14D7BC-A21E-46D2-9E1D-F69E52827F00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C14D7BC-A21E-46D2-9E1D-F69E52827F00}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C14D7BC-A21E-46D2-9E1D-F69E52827F00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9D80BF9-DBA6-4130-B5F4-0D5080DD2218}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9D80BF9-DBA6-4130-B5F4-0D5080DD2218}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9D80BF9-DBA6-4130-B5F4-0D5080DD2218}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9D80BF9-DBA6-4130-B5F4-0D5080DD2218}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E8D8465-FA66-45C2-A0FF-541D9D8E70EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E8D8465-FA66-45C2-A0FF-541D9D8E70EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E8D8465-FA66-45C2-A0FF-541D9D8E70EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E8D8465-FA66-45C2-A0FF-541D9D8E70EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4578FB5F-E69C-4AEF-86F5-FE737E74A324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4578FB5F-E69C-4AEF-86F5-FE737E74A324}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4578FB5F-E69C-4AEF-86F5-FE737E74A324}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4578FB5F-E69C-4AEF-86F5-FE737E74A324}.Release|Any CPU.Build.0 = Release|Any CPU
+		{698B4412-560D-4622-9BCE-9021E1303825}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{698B4412-560D-4622-9BCE-9021E1303825}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{698B4412-560D-4622-9BCE-9021E1303825}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{698B4412-560D-4622-9BCE-9021E1303825}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -62,11 +94,18 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{21CC9F35-ACAA-4452-BE92-BBAE2E927B20} = {E3C3C868-FBDB-4F07-A72E-F734016C0B3B}
 		{3A6C62D5-EFCA-4119-BC60-C917533848A8} = {E3C3C868-FBDB-4F07-A72E-F734016C0B3B}
-		{F148597E-9706-49BD-ACBC-E18F634B5128} = {6F1E3122-547E-4134-BB45-6E33B880DC34}
 		{324E33F0-53FB-4DFD-AEDF-64BCFB2F7821} = {6F1E3122-547E-4134-BB45-6E33B880DC34}
 		{D3B40403-2973-45CE-A0A4-97C38CBE86FE} = {6F1E3122-547E-4134-BB45-6E33B880DC34}
 		{E40DBC0E-386A-4B32-8DCE-9FE13EAD47BE} = {AE1B6C0D-2991-4048-9B81-5683599B0CA4}
 		{7773DB7A-494F-4508-9471-F737FDC7661E} = {87D86F17-7CEB-48DB-99FB-55922ED2A7D1}
+		{0C14D7BC-A21E-46D2-9E1D-F69E52827F00} = {90113343-AD07-450D-B15D-E4E5A8016F60}
+		{E9D80BF9-DBA6-4130-B5F4-0D5080DD2218} = {90113343-AD07-450D-B15D-E4E5A8016F60}
+		{90113343-AD07-450D-B15D-E4E5A8016F60} = {306F6193-BC27-4228-B18C-64B1F3CB9CA7}
+		{2E8D8465-FA66-45C2-A0FF-541D9D8E70EF} = {2C7F0705-AF50-4C07-B501-30C2A42C01A5}
+		{4578FB5F-E69C-4AEF-86F5-FE737E74A324} = {2C7F0705-AF50-4C07-B501-30C2A42C01A5}
+		{2C7F0705-AF50-4C07-B501-30C2A42C01A5} = {306F6193-BC27-4228-B18C-64B1F3CB9CA7}
+		{698B4412-560D-4622-9BCE-9021E1303825} = {358450EF-3CA3-4A72-A60D-98B1988190D2}
+		{358450EF-3CA3-4A72-A60D-98B1988190D2} = {306F6193-BC27-4228-B18C-64B1F3CB9CA7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FB101479-5EAB-495B-ACF3-4B6FC3F830EF}
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 9648ff0a99aeb..ca3be85cd2db1 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
@@ -27,6 +27,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 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}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{9B42414B-38AB-4BCB-B694-36FC3D760C1D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{6982C421-234D-40D2-99DE-C351900750E4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{EFFA895B-26D8-456B-AAF1-A398260ED661}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{97E1EDE0-3AD5-45C9-88F1-C042E58BA064}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{DC1C17DB-648D-4FEA-A25A-7FF646548C17}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F25E8B4D-D7E9-4086-A263-CB9D3B41074B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B8C68464-1D28-4889-90BC-BC80B036B90B}"
@@ -35,6 +45,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BA579BFF-D4D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{39704A56-DFD6-4CC6-A7E4-229E639D9611}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{782D1E7D-9D5B-48B7-A839-D67A69ADD10F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{85E1D5FF-0044-47B8-B495-E201E68671B4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{52909275-45B9-4B14-A82B-E7836F46A1A0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{9E9151C2-3C27-4441-810F-A00FFB979114}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +115,26 @@ Global
 		{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
+		{9B42414B-38AB-4BCB-B694-36FC3D760C1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B42414B-38AB-4BCB-B694-36FC3D760C1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B42414B-38AB-4BCB-B694-36FC3D760C1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B42414B-38AB-4BCB-B694-36FC3D760C1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6982C421-234D-40D2-99DE-C351900750E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6982C421-234D-40D2-99DE-C351900750E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6982C421-234D-40D2-99DE-C351900750E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6982C421-234D-40D2-99DE-C351900750E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EFFA895B-26D8-456B-AAF1-A398260ED661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFFA895B-26D8-456B-AAF1-A398260ED661}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFFA895B-26D8-456B-AAF1-A398260ED661}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFFA895B-26D8-456B-AAF1-A398260ED661}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97E1EDE0-3AD5-45C9-88F1-C042E58BA064}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97E1EDE0-3AD5-45C9-88F1-C042E58BA064}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97E1EDE0-3AD5-45C9-88F1-C042E58BA064}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97E1EDE0-3AD5-45C9-88F1-C042E58BA064}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC1C17DB-648D-4FEA-A25A-7FF646548C17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC1C17DB-648D-4FEA-A25A-7FF646548C17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC1C17DB-648D-4FEA-A25A-7FF646548C17}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC1C17DB-648D-4FEA-A25A-7FF646548C17}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -116,6 +154,14 @@ Global
 		{D75C8817-337C-4DDA-B164-F8822787EE19} = {39704A56-DFD6-4CC6-A7E4-229E639D9611}
 		{2CE79894-A115-4C92-86E2-7B392EBCBD83} = {39704A56-DFD6-4CC6-A7E4-229E639D9611}
 		{B15E7AF8-B446-425F-B22A-619A01DEDA16} = {39704A56-DFD6-4CC6-A7E4-229E639D9611}
+		{9B42414B-38AB-4BCB-B694-36FC3D760C1D} = {782D1E7D-9D5B-48B7-A839-D67A69ADD10F}
+		{6982C421-234D-40D2-99DE-C351900750E4} = {782D1E7D-9D5B-48B7-A839-D67A69ADD10F}
+		{782D1E7D-9D5B-48B7-A839-D67A69ADD10F} = {9E9151C2-3C27-4441-810F-A00FFB979114}
+		{EFFA895B-26D8-456B-AAF1-A398260ED661} = {85E1D5FF-0044-47B8-B495-E201E68671B4}
+		{97E1EDE0-3AD5-45C9-88F1-C042E58BA064} = {85E1D5FF-0044-47B8-B495-E201E68671B4}
+		{85E1D5FF-0044-47B8-B495-E201E68671B4} = {9E9151C2-3C27-4441-810F-A00FFB979114}
+		{DC1C17DB-648D-4FEA-A25A-7FF646548C17} = {52909275-45B9-4B14-A82B-E7836F46A1A0}
+		{52909275-45B9-4B14-A82B-E7836F46A1A0} = {9E9151C2-3C27-4441-810F-A00FFB979114}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E0287BE2-B499-4885-8EE8-0B35585CA885}
diff --git a/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln b/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln
index 9c26e7b5642f6..57220bcd94caf 100644
--- a/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln
+++ b/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln
@@ -37,6 +37,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Tests", "tests\System.Security.Cryptography.Tests.csproj", "{A242B3AB-EE45-4C95-9550-DB970BA23CD5}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{7D70A668-5A55-439F-9FB8-8FF2A850CF91}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{390C4E57-0F24-4E07-AFFB-AFBE67D58A52}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{93B28BF5-88A1-4763-913C-6F59F291676A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{CF172501-7056-49E7-93E2-787BD4D95DF1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{0D113CC7-98F1-4323-B064-25A4EC6DA5A8}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B3BB2DA0-53B8-4B49-999F-CD650EB61040}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F591FB6D-6957-46DB-BF9B-C00772BC11E3}"
@@ -45,6 +55,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A16B11D7-673
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2B165D96-356D-409E-88BE-0CA0F407303E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CC457FED-75A7-450C-91C9-F0F4AC6FF4A9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{7D4583A4-938F-4A2F-945D-9FD4FB4F0110}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{1D7DE530-F078-4076-8D77-0A145DD165F6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{5F3BF122-7954-4A83-8196-E8470B0B9C80}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -127,6 +145,26 @@ Global
 		{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
+		{7D70A668-5A55-439F-9FB8-8FF2A850CF91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D70A668-5A55-439F-9FB8-8FF2A850CF91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D70A668-5A55-439F-9FB8-8FF2A850CF91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D70A668-5A55-439F-9FB8-8FF2A850CF91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{390C4E57-0F24-4E07-AFFB-AFBE67D58A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{390C4E57-0F24-4E07-AFFB-AFBE67D58A52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{390C4E57-0F24-4E07-AFFB-AFBE67D58A52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{390C4E57-0F24-4E07-AFFB-AFBE67D58A52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93B28BF5-88A1-4763-913C-6F59F291676A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93B28BF5-88A1-4763-913C-6F59F291676A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93B28BF5-88A1-4763-913C-6F59F291676A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93B28BF5-88A1-4763-913C-6F59F291676A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF172501-7056-49E7-93E2-787BD4D95DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF172501-7056-49E7-93E2-787BD4D95DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF172501-7056-49E7-93E2-787BD4D95DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF172501-7056-49E7-93E2-787BD4D95DF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0D113CC7-98F1-4323-B064-25A4EC6DA5A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D113CC7-98F1-4323-B064-25A4EC6DA5A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D113CC7-98F1-4323-B064-25A4EC6DA5A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D113CC7-98F1-4323-B064-25A4EC6DA5A8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -151,6 +189,14 @@ Global
 		{0EA41D6A-87A2-42B7-8171-78E167570993} = {2B165D96-356D-409E-88BE-0CA0F407303E}
 		{9E7AD0F4-0D4D-4E42-8C6C-513C006E0590} = {2B165D96-356D-409E-88BE-0CA0F407303E}
 		{1B999BF7-657A-4342-A97E-B5CC5916AFB4} = {2B165D96-356D-409E-88BE-0CA0F407303E}
+		{7D70A668-5A55-439F-9FB8-8FF2A850CF91} = {CC457FED-75A7-450C-91C9-F0F4AC6FF4A9}
+		{390C4E57-0F24-4E07-AFFB-AFBE67D58A52} = {CC457FED-75A7-450C-91C9-F0F4AC6FF4A9}
+		{CC457FED-75A7-450C-91C9-F0F4AC6FF4A9} = {5F3BF122-7954-4A83-8196-E8470B0B9C80}
+		{93B28BF5-88A1-4763-913C-6F59F291676A} = {7D4583A4-938F-4A2F-945D-9FD4FB4F0110}
+		{CF172501-7056-49E7-93E2-787BD4D95DF1} = {7D4583A4-938F-4A2F-945D-9FD4FB4F0110}
+		{7D4583A4-938F-4A2F-945D-9FD4FB4F0110} = {5F3BF122-7954-4A83-8196-E8470B0B9C80}
+		{0D113CC7-98F1-4323-B064-25A4EC6DA5A8} = {1D7DE530-F078-4076-8D77-0A145DD165F6}
+		{1D7DE530-F078-4076-8D77-0A145DD165F6} = {5F3BF122-7954-4A83-8196-E8470B0B9C80}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F5615383-F387-45EA-A05A-CB65D8A6FE88}
diff --git a/src/libraries/System.Security.Permissions/System.Security.Permissions.sln b/src/libraries/System.Security.Permissions/System.Security.Permissions.sln
index 13c43e863d637..b233dfa392824 100644
--- a/src/libraries/System.Security.Permissions/System.Security.Permissions.sln
+++ b/src/libraries/System.Security.Permissions/System.Security.Permissions.sln
@@ -1,16 +1,28 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}"
+EndProject
 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.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{B4058365-B232-433F-882B-1ADC77198BFE}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\ref\System.DirectoryServices.csproj", "{A629F9A5-1EA5-475F-9A49-29C81198CF34}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\src\System.DirectoryServices.csproj", "{7E64D2D1-7ED9-490A-B658-5E2162F571D6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{5A1D48AD-ECA3-4870-9268-426FE6CCC6E9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{92D383A1-2440-4D89-8071-6A5159A7C6EF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{6029A164-8081-4469-8248-18FF73050660}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{86E25854-BE58-41CF-9DF6-4669C4D23D05}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{E2926598-EE1D-4DA3-AD75-11D54F1EF318}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{E248AA4A-5E55-43D6-BC81-8578542F605A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{371555F7-F80C-448F-93A3-C43EFE5AC12B}"
+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}"
@@ -21,80 +33,554 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{25C80847-6651-4D9D-B625-24D756EC48CA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{015DEF24-D141-43D4-AF88-67F17F341F32}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{97C6E424-BBBA-495D-8261-E5ADBABA2B29}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{C6667A06-3805-4268-95F3-F7E64C153FF7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{20126308-D657-417C-832A-C72AAD482BB3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{63AEC067-DCBE-4531-8E89-EBFBEB507503}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{2B31BB89-A386-4177-8BD8-3AAB0CA50E25}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{25C80847-6651-4D9D-B625-24D756EC48CA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9C0E3C0E-FFF8-4241-8942-A77093C003F1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{97C6E424-BBBA-495D-8261-E5ADBABA2B29}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{EA13AEBA-B53D-4A6C-8BA1-FB1748B87675}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D34F8F34-A420-4794-BDFB-42166D02D866}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{311B3045-E4B9-4059-87C2-5945F6292F0A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{702008EE-4C11-4118-83EF-BCE55414E11C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{126E625A-D9FB-4072-887F-311095BFB1B8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm = Debug|arm
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm = Release|arm
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Debug|Any CPU.Build.0 = Debug|x64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Debug|arm.ActiveCfg = Debug|arm
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Debug|arm.Build.0 = Debug|arm
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Debug|arm64.ActiveCfg = Debug|arm64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Debug|arm64.Build.0 = Debug|arm64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Debug|x64.ActiveCfg = Debug|x64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Debug|x64.Build.0 = Debug|x64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Debug|x86.ActiveCfg = Debug|x86
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Debug|x86.Build.0 = Debug|x86
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Release|Any CPU.ActiveCfg = Release|x64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Release|Any CPU.Build.0 = Release|x64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Release|arm.ActiveCfg = Release|arm
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Release|arm.Build.0 = Release|arm
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Release|arm64.ActiveCfg = Release|arm64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Release|arm64.Build.0 = Release|arm64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Release|x64.ActiveCfg = Release|x64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Release|x64.Build.0 = Release|x64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Release|x86.ActiveCfg = Release|x86
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Release|x86.Build.0 = Release|x86
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Checked|Any CPU.Build.0 = Checked|x64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Checked|arm.ActiveCfg = Checked|arm
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Checked|arm.Build.0 = Checked|arm
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Checked|arm64.ActiveCfg = Checked|arm64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Checked|arm64.Build.0 = Checked|arm64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Checked|x64.ActiveCfg = Checked|x64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Checked|x64.Build.0 = Checked|x64
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Checked|x86.ActiveCfg = Checked|x86
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9}.Checked|x86.Build.0 = Checked|x86
 		{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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Debug|x64.Build.0 = Debug|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Debug|x86.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
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Release|arm.ActiveCfg = Release|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Release|x64.ActiveCfg = Release|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Release|x64.Build.0 = Release|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Release|x86.ActiveCfg = Release|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Release|x86.Build.0 = Release|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Debug|x64.Build.0 = Debug|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Debug|x86.Build.0 = Debug|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Release|arm.ActiveCfg = Release|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Release|x64.ActiveCfg = Release|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Release|x64.Build.0 = Release|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Release|x86.ActiveCfg = Release|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Release|x86.Build.0 = Release|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B4058365-B232-433F-882B-1ADC77198BFE}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Debug|x64.Build.0 = Debug|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Debug|x86.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
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Release|arm.ActiveCfg = Release|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Release|x64.ActiveCfg = Release|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Release|x64.Build.0 = Release|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Release|x86.ActiveCfg = Release|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Release|x86.Build.0 = Release|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Debug|x64.Build.0 = Debug|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Debug|x86.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
-		{5A1D48AD-ECA3-4870-9268-426FE6CCC6E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A1D48AD-ECA3-4870-9268-426FE6CCC6E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A1D48AD-ECA3-4870-9268-426FE6CCC6E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5A1D48AD-ECA3-4870-9268-426FE6CCC6E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Release|arm.ActiveCfg = Release|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Release|x64.ActiveCfg = Release|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Release|x64.Build.0 = Release|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Release|x86.ActiveCfg = Release|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Release|x86.Build.0 = Release|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Debug|x64.Build.0 = Debug|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Debug|x86.Build.0 = Debug|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Release|arm.ActiveCfg = Release|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Release|x64.ActiveCfg = Release|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Release|x64.Build.0 = Release|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Release|x86.ActiveCfg = Release|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Release|x86.Build.0 = Release|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Debug|x64.Build.0 = Debug|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Debug|x86.Build.0 = Debug|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Release|arm.ActiveCfg = Release|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Release|x64.ActiveCfg = Release|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Release|x64.Build.0 = Release|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Release|x86.ActiveCfg = Release|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Release|x86.Build.0 = Release|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Debug|x64.Build.0 = Debug|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Debug|x86.Build.0 = Debug|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Release|arm.ActiveCfg = Release|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Release|x64.ActiveCfg = Release|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Release|x64.Build.0 = Release|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Release|x86.ActiveCfg = Release|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Release|x86.Build.0 = Release|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6029A164-8081-4469-8248-18FF73050660}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Debug|x64.Build.0 = Debug|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Debug|x86.Build.0 = Debug|Any CPU
 		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Release|arm.ActiveCfg = Release|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Release|arm64.ActiveCfg = Release|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Release|x64.ActiveCfg = Release|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Release|x64.Build.0 = Release|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Release|x86.ActiveCfg = Release|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Release|x86.Build.0 = Release|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{86E25854-BE58-41CF-9DF6-4669C4D23D05}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Debug|x64.Build.0 = Debug|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Debug|x86.Build.0 = Debug|Any CPU
 		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Release|arm.ActiveCfg = Release|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Release|x64.ActiveCfg = Release|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Release|x64.Build.0 = Release|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Release|x86.ActiveCfg = Release|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Release|x86.Build.0 = Release|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Debug|x64.Build.0 = Debug|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Debug|x86.Build.0 = Debug|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Release|arm.ActiveCfg = Release|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Release|x64.ActiveCfg = Release|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Release|x64.Build.0 = Release|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Release|x86.ActiveCfg = Release|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Release|x86.Build.0 = Release|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E248AA4A-5E55-43D6-BC81-8578542F605A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Debug|x64.Build.0 = Debug|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Debug|x86.Build.0 = Debug|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Release|arm.ActiveCfg = Release|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Release|x64.ActiveCfg = Release|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Release|x64.Build.0 = Release|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Release|x86.ActiveCfg = Release|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Release|x86.Build.0 = Release|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Debug|x64.Build.0 = Debug|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Debug|x86.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
+		{F238F227-522D-4886-A6B5-474948B3C660}.Release|arm.ActiveCfg = Release|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Release|x64.ActiveCfg = Release|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Release|x64.Build.0 = Release|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Release|x86.ActiveCfg = Release|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Release|x86.Build.0 = Release|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Debug|x64.Build.0 = Debug|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Debug|x86.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
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Release|arm.ActiveCfg = Release|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Release|arm64.ActiveCfg = Release|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Release|x64.ActiveCfg = Release|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Release|x64.Build.0 = Release|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Release|x86.ActiveCfg = Release|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Release|x86.Build.0 = Release|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Debug|x64.Build.0 = Debug|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Debug|x86.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
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Release|arm.ActiveCfg = Release|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Release|x64.ActiveCfg = Release|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Release|x64.Build.0 = Release|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Release|x86.ActiveCfg = Release|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Release|x86.Build.0 = Release|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Debug|x64.Build.0 = Debug|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Debug|x86.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
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Release|arm.ActiveCfg = Release|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Release|arm64.ActiveCfg = Release|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Release|x64.ActiveCfg = Release|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Release|x64.Build.0 = Release|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Release|x86.ActiveCfg = Release|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Release|x86.Build.0 = Release|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Debug|x64.Build.0 = Debug|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Debug|x86.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
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Release|arm.ActiveCfg = Release|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Release|x64.ActiveCfg = Release|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Release|x64.Build.0 = Release|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Release|x86.ActiveCfg = Release|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Release|x86.Build.0 = Release|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Debug|x64.Build.0 = Debug|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Debug|x86.Build.0 = Debug|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Release|arm.ActiveCfg = Release|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Release|arm64.ActiveCfg = Release|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Release|x64.ActiveCfg = Release|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Release|x64.Build.0 = Release|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Release|x86.ActiveCfg = Release|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Release|x86.Build.0 = Release|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{015DEF24-D141-43D4-AF88-67F17F341F32}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Debug|x64.Build.0 = Debug|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Debug|x86.Build.0 = Debug|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Release|arm.ActiveCfg = Release|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Release|x64.ActiveCfg = Release|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Release|x64.Build.0 = Release|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Release|x86.ActiveCfg = Release|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Release|x86.Build.0 = Release|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Debug|x64.Build.0 = Debug|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Debug|x86.Build.0 = Debug|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Release|arm.ActiveCfg = Release|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Release|arm64.ActiveCfg = Release|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Release|x64.ActiveCfg = Release|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Release|x64.Build.0 = Release|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Release|x86.ActiveCfg = Release|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Release|x86.Build.0 = Release|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C6667A06-3805-4268-95F3-F7E64C153FF7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Debug|x64.Build.0 = Debug|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Debug|x86.Build.0 = Debug|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Release|arm.ActiveCfg = Release|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Release|arm64.ActiveCfg = Release|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Release|x64.ActiveCfg = Release|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Release|x64.Build.0 = Release|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Release|x86.ActiveCfg = Release|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Release|x86.Build.0 = Release|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{20126308-D657-417C-832A-C72AAD482BB3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Debug|x64.Build.0 = Debug|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Debug|x86.Build.0 = Debug|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Release|arm.ActiveCfg = Release|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Release|arm64.ActiveCfg = Release|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Release|x64.ActiveCfg = Release|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Release|x64.Build.0 = Release|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Release|x86.ActiveCfg = Release|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Release|x86.Build.0 = Release|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{C7F0324A-249D-4F7E-8C9C-6AF05A9357A9} = {2B31BB89-A386-4177-8BD8-3AAB0CA50E25}
 		{74374CDE-23F8-4041-8F94-D5CBC23735C6} = {25C80847-6651-4D9D-B625-24D756EC48CA}
 		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1} = {25C80847-6651-4D9D-B625-24D756EC48CA}
-		{A629F9A5-1EA5-475F-9A49-29C81198CF34} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29}
-		{F238F227-522D-4886-A6B5-474948B3C660} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29}
-		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29}
+		{B4058365-B232-433F-882B-1ADC77198BFE} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1}
 		{7E64D2D1-7ED9-490A-B658-5E2162F571D6} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1}
+		{6029A164-8081-4469-8248-18FF73050660} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1}
+		{371555F7-F80C-448F-93A3-C43EFE5AC12B} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1}
 		{CE88C6B8-C9B6-4695-BA23-BE8955018E26} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1}
 		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1}
-		{5A1D48AD-ECA3-4870-9268-426FE6CCC6E9} = {EA13AEBA-B53D-4A6C-8BA1-FB1748B87675}
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29}
+		{92D383A1-2440-4D89-8071-6A5159A7C6EF} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29}
+		{E248AA4A-5E55-43D6-BC81-8578542F605A} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29}
+		{F238F227-522D-4886-A6B5-474948B3C660} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29}
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29}
+		{C7396F74-3B9A-4FFC-B9E7-45074C6104CF} = {EA13AEBA-B53D-4A6C-8BA1-FB1748B87675}
 		{86E25854-BE58-41CF-9DF6-4669C4D23D05} = {EA13AEBA-B53D-4A6C-8BA1-FB1748B87675}
 		{E2926598-EE1D-4DA3-AD75-11D54F1EF318} = {EA13AEBA-B53D-4A6C-8BA1-FB1748B87675}
+		{015DEF24-D141-43D4-AF88-67F17F341F32} = {D34F8F34-A420-4794-BDFB-42166D02D866}
+		{7CB8ADAD-F584-402B-B76A-FB1DE2114D3B} = {D34F8F34-A420-4794-BDFB-42166D02D866}
+		{D34F8F34-A420-4794-BDFB-42166D02D866} = {126E625A-D9FB-4072-887F-311095BFB1B8}
+		{C6667A06-3805-4268-95F3-F7E64C153FF7} = {311B3045-E4B9-4059-87C2-5945F6292F0A}
+		{20126308-D657-417C-832A-C72AAD482BB3} = {311B3045-E4B9-4059-87C2-5945F6292F0A}
+		{311B3045-E4B9-4059-87C2-5945F6292F0A} = {126E625A-D9FB-4072-887F-311095BFB1B8}
+		{63AEC067-DCBE-4531-8E89-EBFBEB507503} = {702008EE-4C11-4118-83EF-BCE55414E11C}
+		{702008EE-4C11-4118-83EF-BCE55414E11C} = {126E625A-D9FB-4072-887F-311095BFB1B8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3A482AFF-93CE-43E0-9C2A-64424A25D364}
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 72da69702aa9f..bbf3fa2e1e52a 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
@@ -17,6 +17,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.W
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{9D6AEBF2-9DF5-4AAA-A1F8-61B698B3991C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{AAC701AE-19A5-40C5-A1E7-B883B4B7BC6A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{F5DEBA1E-92D7-4B0E-840A-20338ED4ABA5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{DE03EB5C-19FC-4D1C-8F09-F0C302C5DB66}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{CAD69BB3-0649-4980-AFEB-9D4DA22BCB4A}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0CC51645-FA2D-44E8-9A91-562DF28F2236}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5D05713D-8A07-4460-846C-4FAAE60211D3}"
@@ -25,6 +35,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4D97C07E-8EA
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8AA6E2BC-BA18-48AE-93DA-6F694A7FA8B1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{2CC2982B-0CC7-467F-8AC2-5B7440E2C708}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{BC672DC8-8631-48EE-BB8A-BF2A25FAD0A9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{D5253F42-40D2-4BBF-A32F-64A5AED22ABA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{08B994E3-4D52-440F-9D87-D4D8BADBA5E8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,6 +85,26 @@ Global
 		{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
+		{9D6AEBF2-9DF5-4AAA-A1F8-61B698B3991C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D6AEBF2-9DF5-4AAA-A1F8-61B698B3991C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D6AEBF2-9DF5-4AAA-A1F8-61B698B3991C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D6AEBF2-9DF5-4AAA-A1F8-61B698B3991C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AAC701AE-19A5-40C5-A1E7-B883B4B7BC6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAC701AE-19A5-40C5-A1E7-B883B4B7BC6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAC701AE-19A5-40C5-A1E7-B883B4B7BC6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAC701AE-19A5-40C5-A1E7-B883B4B7BC6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5DEBA1E-92D7-4B0E-840A-20338ED4ABA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5DEBA1E-92D7-4B0E-840A-20338ED4ABA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5DEBA1E-92D7-4B0E-840A-20338ED4ABA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5DEBA1E-92D7-4B0E-840A-20338ED4ABA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE03EB5C-19FC-4D1C-8F09-F0C302C5DB66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE03EB5C-19FC-4D1C-8F09-F0C302C5DB66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE03EB5C-19FC-4D1C-8F09-F0C302C5DB66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE03EB5C-19FC-4D1C-8F09-F0C302C5DB66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAD69BB3-0649-4980-AFEB-9D4DA22BCB4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAD69BB3-0649-4980-AFEB-9D4DA22BCB4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAD69BB3-0649-4980-AFEB-9D4DA22BCB4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAD69BB3-0649-4980-AFEB-9D4DA22BCB4A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -81,6 +119,14 @@ Global
 		{7F3D4F76-ECA1-4076-B95B-D7911EF69119} = {4D97C07E-8EAF-45ED-A729-AC7680C2F58F}
 		{F6A57CBE-E4F4-444A-8CFA-918D1124BC93} = {4D97C07E-8EAF-45ED-A729-AC7680C2F58F}
 		{AA2C3AEB-53FA-4F69-8769-89DCE8221299} = {8AA6E2BC-BA18-48AE-93DA-6F694A7FA8B1}
+		{9D6AEBF2-9DF5-4AAA-A1F8-61B698B3991C} = {2CC2982B-0CC7-467F-8AC2-5B7440E2C708}
+		{AAC701AE-19A5-40C5-A1E7-B883B4B7BC6A} = {2CC2982B-0CC7-467F-8AC2-5B7440E2C708}
+		{2CC2982B-0CC7-467F-8AC2-5B7440E2C708} = {08B994E3-4D52-440F-9D87-D4D8BADBA5E8}
+		{F5DEBA1E-92D7-4B0E-840A-20338ED4ABA5} = {BC672DC8-8631-48EE-BB8A-BF2A25FAD0A9}
+		{DE03EB5C-19FC-4D1C-8F09-F0C302C5DB66} = {BC672DC8-8631-48EE-BB8A-BF2A25FAD0A9}
+		{BC672DC8-8631-48EE-BB8A-BF2A25FAD0A9} = {08B994E3-4D52-440F-9D87-D4D8BADBA5E8}
+		{CAD69BB3-0649-4980-AFEB-9D4DA22BCB4A} = {D5253F42-40D2-4BBF-A32F-64A5AED22ABA}
+		{D5253F42-40D2-4BBF-A32F-64A5AED22ABA} = {08B994E3-4D52-440F-9D87-D4D8BADBA5E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F45E7C49-4541-4445-ADF1-DD57AF4E13F5}
diff --git a/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln b/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln
index 7b697cb2cb499..85fdfc94bf365 100644
--- a/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln
+++ b/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln
@@ -1,8 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{66CD0AD6-EBEE-468B-9732-A4C49EF492F4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{03A44C9B-A7BF-4AC5-B2B3-B0B375FD2032}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{E97F3254-DDEB-4670-9BA0-2889D20873C6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{6FB3EC19-1083-4AFD-8F7D-FB1224C965A0}"
@@ -13,6 +11,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.Syndica
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.Syndication.Tests", "tests\System.ServiceModel.Syndication.Tests.csproj", "{0269CAF5-9979-49A1-AC7B-61139BBBA182}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{D2AD56FD-4F76-4078-A8E7-3404A39C95B0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{339B03B0-1E85-46B5-A6EB-35E0BECF76EE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{E2183BFE-66CE-418F-9359-A9797734D4CE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{936D914F-513F-493D-90D4-41E07D414B5C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{833A0190-3C52-449D-8413-49043B5596E2}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{38797FCA-196F-4A36-B6E6-1861269F84A8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{9727DC59-CDC4-465C-BDCF-01C3CEEC18F5}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{93DCE9EB-54B
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5C16F923-3CC4-41E8-A22C-ED99BEB8A497}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{EFE9F6F0-57E7-417A-B1FB-902035B11418}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{87AC15B9-A099-40C1-97C3-E5FC880A0BFE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{9B30AF16-B8F4-41AD-86DB-8BECAA1B2591}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{7918CA45-EB79-4CEB-920E-045E42E65520}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,10 +47,6 @@ Global
 		{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
-		{03A44C9B-A7BF-4AC5-B2B3-B0B375FD2032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{03A44C9B-A7BF-4AC5-B2B3-B0B375FD2032}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03A44C9B-A7BF-4AC5-B2B3-B0B375FD2032}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{03A44C9B-A7BF-4AC5-B2B3-B0B375FD2032}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E97F3254-DDEB-4670-9BA0-2889D20873C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E97F3254-DDEB-4670-9BA0-2889D20873C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E97F3254-DDEB-4670-9BA0-2889D20873C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{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
+		{D2AD56FD-4F76-4078-A8E7-3404A39C95B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2AD56FD-4F76-4078-A8E7-3404A39C95B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2AD56FD-4F76-4078-A8E7-3404A39C95B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2AD56FD-4F76-4078-A8E7-3404A39C95B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{339B03B0-1E85-46B5-A6EB-35E0BECF76EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{339B03B0-1E85-46B5-A6EB-35E0BECF76EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{339B03B0-1E85-46B5-A6EB-35E0BECF76EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{339B03B0-1E85-46B5-A6EB-35E0BECF76EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2183BFE-66CE-418F-9359-A9797734D4CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2183BFE-66CE-418F-9359-A9797734D4CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2183BFE-66CE-418F-9359-A9797734D4CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2183BFE-66CE-418F-9359-A9797734D4CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{936D914F-513F-493D-90D4-41E07D414B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{936D914F-513F-493D-90D4-41E07D414B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{936D914F-513F-493D-90D4-41E07D414B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{936D914F-513F-493D-90D4-41E07D414B5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{833A0190-3C52-449D-8413-49043B5596E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{833A0190-3C52-449D-8413-49043B5596E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{833A0190-3C52-449D-8413-49043B5596E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{833A0190-3C52-449D-8413-49043B5596E2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -62,11 +94,18 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{66CD0AD6-EBEE-468B-9732-A4C49EF492F4} = {38797FCA-196F-4A36-B6E6-1861269F84A8}
 		{0269CAF5-9979-49A1-AC7B-61139BBBA182} = {38797FCA-196F-4A36-B6E6-1861269F84A8}
-		{03A44C9B-A7BF-4AC5-B2B3-B0B375FD2032} = {9727DC59-CDC4-465C-BDCF-01C3CEEC18F5}
 		{E97F3254-DDEB-4670-9BA0-2889D20873C6} = {9727DC59-CDC4-465C-BDCF-01C3CEEC18F5}
 		{6FB3EC19-1083-4AFD-8F7D-FB1224C965A0} = {9727DC59-CDC4-465C-BDCF-01C3CEEC18F5}
 		{2A7BBE91-0165-45E9-8A10-D7346C5179B6} = {93DCE9EB-54B4-45FE-BA5D-046CBAD043FA}
 		{02AF5461-4FB0-48B1-AD93-9D5F1022B1E9} = {5C16F923-3CC4-41E8-A22C-ED99BEB8A497}
+		{D2AD56FD-4F76-4078-A8E7-3404A39C95B0} = {EFE9F6F0-57E7-417A-B1FB-902035B11418}
+		{339B03B0-1E85-46B5-A6EB-35E0BECF76EE} = {EFE9F6F0-57E7-417A-B1FB-902035B11418}
+		{EFE9F6F0-57E7-417A-B1FB-902035B11418} = {7918CA45-EB79-4CEB-920E-045E42E65520}
+		{E2183BFE-66CE-418F-9359-A9797734D4CE} = {87AC15B9-A099-40C1-97C3-E5FC880A0BFE}
+		{936D914F-513F-493D-90D4-41E07D414B5C} = {87AC15B9-A099-40C1-97C3-E5FC880A0BFE}
+		{87AC15B9-A099-40C1-97C3-E5FC880A0BFE} = {7918CA45-EB79-4CEB-920E-045E42E65520}
+		{833A0190-3C52-449D-8413-49043B5596E2} = {9B30AF16-B8F4-41AD-86DB-8BECAA1B2591}
+		{9B30AF16-B8F4-41AD-86DB-8BECAA1B2591} = {7918CA45-EB79-4CEB-920E-045E42E65520}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BCEBC86B-FB61-475D-B3A0-6C556A7B5E3B}
diff --git a/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln b/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
index 670dce4ce8c5f..cde7b772e22e1 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
+++ b/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\src\System.Diagnostics.EventLog.csproj", "{FC3FBFFE-B1BC-4C1B-AC1A-8714767A940E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{A25AE24A-E495-4D05-A30F-AD4692B4D71A}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{FD427105-4DFB-4DD3-A8B6-99F6F6367B9F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C386F669-744B-4DC7-9A8C-C89B5B6C1B00}"
@@ -21,6 +19,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.Servi
 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}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{0018BA6B-672A-46E7-894D-B49B84704D29}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{E4F36780-B2E1-4661-AB55-3FD6F4B0E3E9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{17362647-AA6B-4221-8CB4-42E8E6D7F268}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{63B673B9-D8DE-4355-BEC9-A3EF8F502B84}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{F61AFBFB-8C1D-4795-9D37-B08E9C24458E}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{60A3623C-9BB6-45B8-B1FB-2DB246723CF7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9F6956E6-D922-48F6-B565-4A5679A9C856}"
@@ -29,6 +37,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CCD3324D-294
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B5D3C592-0D89-4E68-AAE9-F0411AD9C72C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CFE5523B-4A20-49A7-A7A4-42BAE782F74C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{6E3B355B-6BBE-4BA5-8433-63BD3D133F6B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{5AC65E83-A012-4EA4-969A-E3FD6F882E98}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{C0EB6FE3-D179-4AFC-97E1-CF66F3EFB790}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -51,10 +67,6 @@ Global
 		{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
-		{A25AE24A-E495-4D05-A30F-AD4692B4D71A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A25AE24A-E495-4D05-A30F-AD4692B4D71A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A25AE24A-E495-4D05-A30F-AD4692B4D71A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A25AE24A-E495-4D05-A30F-AD4692B4D71A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FD427105-4DFB-4DD3-A8B6-99F6F6367B9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD427105-4DFB-4DD3-A8B6-99F6F6367B9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD427105-4DFB-4DD3-A8B6-99F6F6367B9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -79,6 +91,26 @@ Global
 		{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
+		{0018BA6B-672A-46E7-894D-B49B84704D29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0018BA6B-672A-46E7-894D-B49B84704D29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0018BA6B-672A-46E7-894D-B49B84704D29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0018BA6B-672A-46E7-894D-B49B84704D29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E4F36780-B2E1-4661-AB55-3FD6F4B0E3E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4F36780-B2E1-4661-AB55-3FD6F4B0E3E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4F36780-B2E1-4661-AB55-3FD6F4B0E3E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E4F36780-B2E1-4661-AB55-3FD6F4B0E3E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17362647-AA6B-4221-8CB4-42E8E6D7F268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17362647-AA6B-4221-8CB4-42E8E6D7F268}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17362647-AA6B-4221-8CB4-42E8E6D7F268}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17362647-AA6B-4221-8CB4-42E8E6D7F268}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63B673B9-D8DE-4355-BEC9-A3EF8F502B84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63B673B9-D8DE-4355-BEC9-A3EF8F502B84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63B673B9-D8DE-4355-BEC9-A3EF8F502B84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63B673B9-D8DE-4355-BEC9-A3EF8F502B84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F61AFBFB-8C1D-4795-9D37-B08E9C24458E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F61AFBFB-8C1D-4795-9D37-B08E9C24458E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F61AFBFB-8C1D-4795-9D37-B08E9C24458E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F61AFBFB-8C1D-4795-9D37-B08E9C24458E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -92,9 +124,16 @@ Global
 		{BCA9AEAA-30EF-4B5F-B773-219F200CDB25} = {CCD3324D-2948-43FE-B2F2-B386F7EBEC09}
 		{FC3FBFFE-B1BC-4C1B-AC1A-8714767A940E} = {CCD3324D-2948-43FE-B2F2-B386F7EBEC09}
 		{8B01C9B1-1B3A-47A1-9851-CCD3721237BF} = {CCD3324D-2948-43FE-B2F2-B386F7EBEC09}
-		{A25AE24A-E495-4D05-A30F-AD4692B4D71A} = {B5D3C592-0D89-4E68-AAE9-F0411AD9C72C}
 		{FD427105-4DFB-4DD3-A8B6-99F6F6367B9F} = {B5D3C592-0D89-4E68-AAE9-F0411AD9C72C}
 		{C386F669-744B-4DC7-9A8C-C89B5B6C1B00} = {B5D3C592-0D89-4E68-AAE9-F0411AD9C72C}
+		{0018BA6B-672A-46E7-894D-B49B84704D29} = {CFE5523B-4A20-49A7-A7A4-42BAE782F74C}
+		{E4F36780-B2E1-4661-AB55-3FD6F4B0E3E9} = {CFE5523B-4A20-49A7-A7A4-42BAE782F74C}
+		{CFE5523B-4A20-49A7-A7A4-42BAE782F74C} = {C0EB6FE3-D179-4AFC-97E1-CF66F3EFB790}
+		{17362647-AA6B-4221-8CB4-42E8E6D7F268} = {6E3B355B-6BBE-4BA5-8433-63BD3D133F6B}
+		{63B673B9-D8DE-4355-BEC9-A3EF8F502B84} = {6E3B355B-6BBE-4BA5-8433-63BD3D133F6B}
+		{6E3B355B-6BBE-4BA5-8433-63BD3D133F6B} = {C0EB6FE3-D179-4AFC-97E1-CF66F3EFB790}
+		{F61AFBFB-8C1D-4795-9D37-B08E9C24458E} = {5AC65E83-A012-4EA4-969A-E3FD6F882E98}
+		{5AC65E83-A012-4EA4-969A-E3FD6F882E98} = {C0EB6FE3-D179-4AFC-97E1-CF66F3EFB790}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A60086D8-4665-4FB4-ABA7-A74F0CC9983D}
diff --git a/src/libraries/System.Speech/System.Speech.sln b/src/libraries/System.Speech/System.Speech.sln
index 6910e1ab8014c..8be05874fc5d3 100644
--- a/src/libraries/System.Speech/System.Speech.sln
+++ b/src/libraries/System.Speech/System.Speech.sln
@@ -1,8 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0C0DD088-AF6A-4508-9501-399B92F815A5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{5BF46571-681F-4E49-8DA8-E8040B1FE32D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2B432AE1-F4E7-4A9B-83FC-EB0E8F2A89D4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B6DC3B86-B125-412A-81C6-0AFECFE4A08A}"
@@ -13,6 +11,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Speech", "src\System
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Speech.Tests", "tests\System.Speech.Tests.csproj", "{E26B6065-4016-4385-9AB2-EEBE2C97CEE7}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{F70265ED-03F7-4F8B-A0E8-75490A8BEEE9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{5852303B-818D-4CC5-8D17-689578F4D953}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{0BFC515F-B05D-412C-B250-A2A2BB438C93}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{1B15B746-BC03-40F1-B2DA-8B6B2C957A23}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{FD765DDF-DFF1-4514-A5F0-3FDAA962DBB4}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C516711E-47BF-4337-A52D-DF1E2B29EDCB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{59770FE6-B1BD-4817-8664-DC33233399F5}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6DC14447-332
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3C2EFE00-44E6-4803-BC19-A7DB02BE7747}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{F7522225-0A4E-47F8-8B6C-94FA0FE77CDD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{69C54DFF-01F4-454C-B75E-D83E8A80344B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{29F08468-B124-4ECE-A05D-9A0A41C6488D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{B2B8D663-46C1-438A-81FC-D95C8E158F2B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,10 +47,6 @@ Global
 		{0C0DD088-AF6A-4508-9501-399B92F815A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0C0DD088-AF6A-4508-9501-399B92F815A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C0DD088-AF6A-4508-9501-399B92F815A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BF46571-681F-4E49-8DA8-E8040B1FE32D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BF46571-681F-4E49-8DA8-E8040B1FE32D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BF46571-681F-4E49-8DA8-E8040B1FE32D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BF46571-681F-4E49-8DA8-E8040B1FE32D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2B432AE1-F4E7-4A9B-83FC-EB0E8F2A89D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B432AE1-F4E7-4A9B-83FC-EB0E8F2A89D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2B432AE1-F4E7-4A9B-83FC-EB0E8F2A89D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{E26B6065-4016-4385-9AB2-EEBE2C97CEE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E26B6065-4016-4385-9AB2-EEBE2C97CEE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E26B6065-4016-4385-9AB2-EEBE2C97CEE7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F70265ED-03F7-4F8B-A0E8-75490A8BEEE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F70265ED-03F7-4F8B-A0E8-75490A8BEEE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F70265ED-03F7-4F8B-A0E8-75490A8BEEE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F70265ED-03F7-4F8B-A0E8-75490A8BEEE9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5852303B-818D-4CC5-8D17-689578F4D953}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5852303B-818D-4CC5-8D17-689578F4D953}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5852303B-818D-4CC5-8D17-689578F4D953}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5852303B-818D-4CC5-8D17-689578F4D953}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BFC515F-B05D-412C-B250-A2A2BB438C93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BFC515F-B05D-412C-B250-A2A2BB438C93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BFC515F-B05D-412C-B250-A2A2BB438C93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0BFC515F-B05D-412C-B250-A2A2BB438C93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B15B746-BC03-40F1-B2DA-8B6B2C957A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B15B746-BC03-40F1-B2DA-8B6B2C957A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B15B746-BC03-40F1-B2DA-8B6B2C957A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B15B746-BC03-40F1-B2DA-8B6B2C957A23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD765DDF-DFF1-4514-A5F0-3FDAA962DBB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD765DDF-DFF1-4514-A5F0-3FDAA962DBB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD765DDF-DFF1-4514-A5F0-3FDAA962DBB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD765DDF-DFF1-4514-A5F0-3FDAA962DBB4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -62,11 +94,18 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{0C0DD088-AF6A-4508-9501-399B92F815A5} = {C516711E-47BF-4337-A52D-DF1E2B29EDCB}
 		{E26B6065-4016-4385-9AB2-EEBE2C97CEE7} = {C516711E-47BF-4337-A52D-DF1E2B29EDCB}
-		{5BF46571-681F-4E49-8DA8-E8040B1FE32D} = {59770FE6-B1BD-4817-8664-DC33233399F5}
 		{2B432AE1-F4E7-4A9B-83FC-EB0E8F2A89D4} = {59770FE6-B1BD-4817-8664-DC33233399F5}
 		{B6DC3B86-B125-412A-81C6-0AFECFE4A08A} = {59770FE6-B1BD-4817-8664-DC33233399F5}
 		{2D839561-1430-4CA5-9695-6FC9325FF876} = {6DC14447-3322-4AAA-8FDA-3B48D4AB3A17}
 		{D6377882-BD90-46D6-AC60-83498E4BA2B3} = {3C2EFE00-44E6-4803-BC19-A7DB02BE7747}
+		{F70265ED-03F7-4F8B-A0E8-75490A8BEEE9} = {F7522225-0A4E-47F8-8B6C-94FA0FE77CDD}
+		{5852303B-818D-4CC5-8D17-689578F4D953} = {F7522225-0A4E-47F8-8B6C-94FA0FE77CDD}
+		{F7522225-0A4E-47F8-8B6C-94FA0FE77CDD} = {B2B8D663-46C1-438A-81FC-D95C8E158F2B}
+		{0BFC515F-B05D-412C-B250-A2A2BB438C93} = {69C54DFF-01F4-454C-B75E-D83E8A80344B}
+		{1B15B746-BC03-40F1-B2DA-8B6B2C957A23} = {69C54DFF-01F4-454C-B75E-D83E8A80344B}
+		{69C54DFF-01F4-454C-B75E-D83E8A80344B} = {B2B8D663-46C1-438A-81FC-D95C8E158F2B}
+		{FD765DDF-DFF1-4514-A5F0-3FDAA962DBB4} = {29F08468-B124-4ECE-A05D-9A0A41C6488D}
+		{29F08468-B124-4ECE-A05D-9A0A41C6488D} = {B2B8D663-46C1-438A-81FC-D95C8E158F2B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5BD9DF41-48EC-4FB8-998D-122857C5CA73}
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 2b26d5fcdf6ff..9e2f46eba0db3 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
@@ -15,6 +15,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePa
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{3D70E100-0D37-4A32-8DB7-1E26696C7461}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{EE709D3E-54D1-492B-97B9-A52428F1852D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{88D49AAE-0F33-42DB-9374-181375BC333F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{77FBABD9-B54E-4478-B1E9-338CF3632883}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{47559F4C-0335-47DA-87A8-D5E3544421D3}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8CB6F00C-76CE-4F7F-9748-64DD94323A65}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{74B63852-3633-4913-8CA4-54713240919C}"
@@ -23,6 +33,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D39B4CF8-10D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BBC725DC-56DD-4D84-B24C-93B879FCCA94}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{556CEC8A-887B-4C6C-BE44-52A78D561A51}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{9080D10D-EFD3-42EC-99D2-257815043554}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{3CC99FD5-163C-4342-B82F-5F5242AE0F63}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{14B8B029-8A45-4D20-9B26-C27A0D0B7D17}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,6 +79,26 @@ Global
 		{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
+		{3D70E100-0D37-4A32-8DB7-1E26696C7461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D70E100-0D37-4A32-8DB7-1E26696C7461}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D70E100-0D37-4A32-8DB7-1E26696C7461}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D70E100-0D37-4A32-8DB7-1E26696C7461}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE709D3E-54D1-492B-97B9-A52428F1852D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE709D3E-54D1-492B-97B9-A52428F1852D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE709D3E-54D1-492B-97B9-A52428F1852D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE709D3E-54D1-492B-97B9-A52428F1852D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88D49AAE-0F33-42DB-9374-181375BC333F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88D49AAE-0F33-42DB-9374-181375BC333F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88D49AAE-0F33-42DB-9374-181375BC333F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88D49AAE-0F33-42DB-9374-181375BC333F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77FBABD9-B54E-4478-B1E9-338CF3632883}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77FBABD9-B54E-4478-B1E9-338CF3632883}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77FBABD9-B54E-4478-B1E9-338CF3632883}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77FBABD9-B54E-4478-B1E9-338CF3632883}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47559F4C-0335-47DA-87A8-D5E3544421D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47559F4C-0335-47DA-87A8-D5E3544421D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47559F4C-0335-47DA-87A8-D5E3544421D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47559F4C-0335-47DA-87A8-D5E3544421D3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -74,6 +112,14 @@ Global
 		{23B5042D-5ACE-4BB0-A802-1DB758F43428} = {D39B4CF8-10D4-4167-BF2D-FE1BAF33D98D}
 		{C6B27183-6436-4343-A722-17AAB6A11573} = {D39B4CF8-10D4-4167-BF2D-FE1BAF33D98D}
 		{4F894506-769C-4219-BDE7-E1DDE6F1A35D} = {BBC725DC-56DD-4D84-B24C-93B879FCCA94}
+		{3D70E100-0D37-4A32-8DB7-1E26696C7461} = {556CEC8A-887B-4C6C-BE44-52A78D561A51}
+		{EE709D3E-54D1-492B-97B9-A52428F1852D} = {556CEC8A-887B-4C6C-BE44-52A78D561A51}
+		{556CEC8A-887B-4C6C-BE44-52A78D561A51} = {14B8B029-8A45-4D20-9B26-C27A0D0B7D17}
+		{88D49AAE-0F33-42DB-9374-181375BC333F} = {9080D10D-EFD3-42EC-99D2-257815043554}
+		{77FBABD9-B54E-4478-B1E9-338CF3632883} = {9080D10D-EFD3-42EC-99D2-257815043554}
+		{9080D10D-EFD3-42EC-99D2-257815043554} = {14B8B029-8A45-4D20-9B26-C27A0D0B7D17}
+		{47559F4C-0335-47DA-87A8-D5E3544421D3} = {3CC99FD5-163C-4342-B82F-5F5242AE0F63}
+		{3CC99FD5-163C-4342-B82F-5F5242AE0F63} = {14B8B029-8A45-4D20-9B26-C27A0D0B7D17}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F52AE23D-81D9-4AB4-B6BD-256742DFD31A}
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 ed01f38cefb74..9bb9383a5c456 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
@@ -19,7 +19,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.Extens
 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", "{B98CEFA4-10F4-49B1-A922-5ECBB4C20599}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{27FD5826-07FC-4F1B-B837-CD8A717694DD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{56A321F6-574F-4855-841B-8D30680D76B9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{53CE003A-23D7-472C-A5DD-365A623359AE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{7E622A8A-54B7-44AA-8C6F-DA8CEFF1CA4C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6A521BB6-5A53-4871-8EF7-15C4FCF0B416}"
 EndProject
@@ -27,6 +37,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6906BA55-F0A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F4F19285-4785-496C-8F6C-579249EAA5BB}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B98CEFA4-10F4-49B1-A922-5ECBB4C20599}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{457F6647-316B-43ED-9227-081CE0E21C77}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D03A5220-CAD5-4EB4-9DB4-426FBB54C017}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{F9741CAF-491C-4DA8-BC07-9395534D431E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{EF9F14E6-7E8D-43E1-883A-34A4DBC0F0F8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -265,13 +285,117 @@ Global
 		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Checked|arm64.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
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Debug|x64.Build.0 = Debug|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Debug|x86.Build.0 = Debug|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Release|arm.ActiveCfg = Release|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Release|arm64.ActiveCfg = Release|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Release|x64.ActiveCfg = Release|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Release|x64.Build.0 = Release|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Release|x86.ActiveCfg = Release|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Release|x86.Build.0 = Release|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Debug|x64.Build.0 = Debug|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Debug|x86.Build.0 = Debug|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Release|arm.ActiveCfg = Release|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Release|x64.ActiveCfg = Release|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Release|x64.Build.0 = Release|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Release|x86.ActiveCfg = Release|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Release|x86.Build.0 = Release|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Debug|x64.Build.0 = Debug|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Debug|x86.Build.0 = Debug|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Release|arm.ActiveCfg = Release|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Release|arm64.ActiveCfg = Release|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Release|x64.ActiveCfg = Release|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Release|x64.Build.0 = Release|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Release|x86.ActiveCfg = Release|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Release|x86.Build.0 = Release|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{56A321F6-574F-4855-841B-8D30680D76B9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Debug|x64.Build.0 = Debug|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Debug|x86.Build.0 = Debug|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Release|arm.ActiveCfg = Release|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Release|x64.ActiveCfg = Release|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Release|x64.Build.0 = Release|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Release|x86.ActiveCfg = Release|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Release|x86.Build.0 = Release|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Debug|x64.Build.0 = Debug|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Debug|x86.Build.0 = Debug|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Release|arm.ActiveCfg = Release|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Release|arm64.ActiveCfg = Release|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Release|x64.ActiveCfg = Release|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Release|x64.Build.0 = Release|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Release|x86.ActiveCfg = Release|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Release|x86.Build.0 = Release|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{53CE003A-23D7-472C-A5DD-365A623359AE}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{E70D3A84-3053-4E44-82FC-A56A574BF6F8} = {B98CEFA4-10F4-49B1-A922-5ECBB4C20599}
-		{EF713897-15F9-42E4-979F-271FA1EF6ECA} = {B98CEFA4-10F4-49B1-A922-5ECBB4C20599}
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8} = {7E622A8A-54B7-44AA-8C6F-DA8CEFF1CA4C}
 		{CC6D3524-D6C8-468B-B908-CE746C1DB175} = {6A521BB6-5A53-4871-8EF7-15C4FCF0B416}
 		{777B4928-6EE5-42D2-8F95-E43EB027D14E} = {6A521BB6-5A53-4871-8EF7-15C4FCF0B416}
 		{0FB90CF0-6B17-4FAB-A737-0532B5BCAADB} = {6906BA55-F0A0-4E71-942D-E24C6C85A353}
@@ -280,6 +404,15 @@ Global
 		{D6104D98-DF18-4142-A171-E1A38BA8512E} = {F4F19285-4785-496C-8F6C-579249EAA5BB}
 		{0B2A96B8-0B17-4FF5-B95E-4D98CAFF9363} = {F4F19285-4785-496C-8F6C-579249EAA5BB}
 		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C} = {F4F19285-4785-496C-8F6C-579249EAA5BB}
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA} = {B98CEFA4-10F4-49B1-A922-5ECBB4C20599}
+		{27FD5826-07FC-4F1B-B837-CD8A717694DD} = {457F6647-316B-43ED-9227-081CE0E21C77}
+		{DF7EE76F-F06B-45E7-81C9-72DAB5F35083} = {457F6647-316B-43ED-9227-081CE0E21C77}
+		{457F6647-316B-43ED-9227-081CE0E21C77} = {EF9F14E6-7E8D-43E1-883A-34A4DBC0F0F8}
+		{56A321F6-574F-4855-841B-8D30680D76B9} = {D03A5220-CAD5-4EB4-9DB4-426FBB54C017}
+		{B10CF21A-DDB0-41B3-830F-58DAD30F6E06} = {D03A5220-CAD5-4EB4-9DB4-426FBB54C017}
+		{D03A5220-CAD5-4EB4-9DB4-426FBB54C017} = {EF9F14E6-7E8D-43E1-883A-34A4DBC0F0F8}
+		{53CE003A-23D7-472C-A5DD-365A623359AE} = {F9741CAF-491C-4DA8-BC07-9395534D431E}
+		{F9741CAF-491C-4DA8-BC07-9395534D431E} = {EF9F14E6-7E8D-43E1-883A-34A4DBC0F0F8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {711E5C3D-F101-4CD2-A3CB-10954791B60C}
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 44a0320502410..1da7867a73dce 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,8 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{43450381-504E-4603-BF5D-99CCAC2B8A26}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{FCCCA35C-E4FD-479E-8F5D-33B4A36AA4C9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4D066E4F-1EF9-46CE-AECC-8D5252E41370}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1C02A4C6-2AEB-46E3-B1D3-84EE2153671A}"
@@ -15,6 +13,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web",
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{AF233792-CF18-40CA-A126-C20E11EF4015}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{4E79D658-6F6C-49DF-945F-8B633F0A6408}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{CC48DDE4-ABA5-48E8-841F-378A0A93B6E2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{7B7FB555-AD80-4EA4-80A4-9913584180BA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{D2E3EAA9-D631-4396-ABB0-630F5DAB1F61}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9DE01EE3-CDAF-4B6E-B778-B5B5D83A9214}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BAAA946F-C5D8-483D-9610-F229125AFEFC}"
@@ -23,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E59B32B-BED
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C88B420B-1505-4CB6-AA13-263AD2D66D93}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{406ED631-1398-4A03-90DB-7F525722B49C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{763D5625-ACC8-4BD0-8CF9-5A2425230958}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{5E26F6E8-E8B4-4AD5-BE1B-504534FC8A01}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{6DCC607A-6B8E-40CF-A0E6-C710428C4218}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,10 +49,6 @@ Global
 		{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
-		{FCCCA35C-E4FD-479E-8F5D-33B4A36AA4C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FCCCA35C-E4FD-479E-8F5D-33B4A36AA4C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FCCCA35C-E4FD-479E-8F5D-33B4A36AA4C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FCCCA35C-E4FD-479E-8F5D-33B4A36AA4C9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4D066E4F-1EF9-46CE-AECC-8D5252E41370}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4D066E4F-1EF9-46CE-AECC-8D5252E41370}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4D066E4F-1EF9-46CE-AECC-8D5252E41370}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,6 +73,26 @@ Global
 		{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
+		{AF233792-CF18-40CA-A126-C20E11EF4015}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF233792-CF18-40CA-A126-C20E11EF4015}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF233792-CF18-40CA-A126-C20E11EF4015}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF233792-CF18-40CA-A126-C20E11EF4015}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E79D658-6F6C-49DF-945F-8B633F0A6408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E79D658-6F6C-49DF-945F-8B633F0A6408}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E79D658-6F6C-49DF-945F-8B633F0A6408}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E79D658-6F6C-49DF-945F-8B633F0A6408}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC48DDE4-ABA5-48E8-841F-378A0A93B6E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC48DDE4-ABA5-48E8-841F-378A0A93B6E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC48DDE4-ABA5-48E8-841F-378A0A93B6E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC48DDE4-ABA5-48E8-841F-378A0A93B6E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B7FB555-AD80-4EA4-80A4-9913584180BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B7FB555-AD80-4EA4-80A4-9913584180BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B7FB555-AD80-4EA4-80A4-9913584180BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B7FB555-AD80-4EA4-80A4-9913584180BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2E3EAA9-D631-4396-ABB0-630F5DAB1F61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2E3EAA9-D631-4396-ABB0-630F5DAB1F61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2E3EAA9-D631-4396-ABB0-630F5DAB1F61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2E3EAA9-D631-4396-ABB0-630F5DAB1F61}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -68,12 +100,19 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{43450381-504E-4603-BF5D-99CCAC2B8A26} = {9DE01EE3-CDAF-4B6E-B778-B5B5D83A9214}
 		{A15B95D2-1DDF-47C9-A92F-03FD5DB720C9} = {9DE01EE3-CDAF-4B6E-B778-B5B5D83A9214}
-		{FCCCA35C-E4FD-479E-8F5D-33B4A36AA4C9} = {BAAA946F-C5D8-483D-9610-F229125AFEFC}
 		{4D066E4F-1EF9-46CE-AECC-8D5252E41370} = {BAAA946F-C5D8-483D-9610-F229125AFEFC}
 		{1C02A4C6-2AEB-46E3-B1D3-84EE2153671A} = {BAAA946F-C5D8-483D-9610-F229125AFEFC}
 		{01218F2E-9DAB-42A4-B79C-589C53CE63E4} = {2E59B32B-BED2-4E24-9055-491C8DF351FB}
 		{635D1626-6D21-4DAB-BFEF-F5F13261967B} = {2E59B32B-BED2-4E24-9055-491C8DF351FB}
 		{9A8107A2-1AC1-44D5-A4D4-D8EB52C3CB18} = {C88B420B-1505-4CB6-AA13-263AD2D66D93}
+		{AF233792-CF18-40CA-A126-C20E11EF4015} = {406ED631-1398-4A03-90DB-7F525722B49C}
+		{4E79D658-6F6C-49DF-945F-8B633F0A6408} = {406ED631-1398-4A03-90DB-7F525722B49C}
+		{406ED631-1398-4A03-90DB-7F525722B49C} = {6DCC607A-6B8E-40CF-A0E6-C710428C4218}
+		{CC48DDE4-ABA5-48E8-841F-378A0A93B6E2} = {763D5625-ACC8-4BD0-8CF9-5A2425230958}
+		{7B7FB555-AD80-4EA4-80A4-9913584180BA} = {763D5625-ACC8-4BD0-8CF9-5A2425230958}
+		{763D5625-ACC8-4BD0-8CF9-5A2425230958} = {6DCC607A-6B8E-40CF-A0E6-C710428C4218}
+		{D2E3EAA9-D631-4396-ABB0-630F5DAB1F61} = {5E26F6E8-E8B4-4AD5-BE1B-504534FC8A01}
+		{5E26F6E8-E8B4-4AD5-BE1B-504534FC8A01} = {6DCC607A-6B8E-40CF-A0E6-C710428C4218}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E109A20C-D7EF-4175-964A-1AF032DB2A3C}
diff --git a/src/libraries/System.Text.Json/System.Text.Json.sln b/src/libraries/System.Text.Json/System.Text.Json.sln
index 730a3cdd50467..b73ea6de093e2 100644
--- a/src/libraries/System.Text.Json/System.Text.Json.sln
+++ b/src/libraries/System.Text.Json/System.Text.Json.sln
@@ -61,6 +61,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGene
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.Tests", "tests\System.Text.Json.Tests\System.Text.Json.Tests.csproj", "{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{03D5F977-D2DA-4586-A662-C99B0E0EEC20}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{A3FCA745-7F4D-4FB8-85A5-422AC92B2704}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{D0277072-F248-47EF-A417-D2612987D899}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{A86642C4-E388-4871-B9FB-A5FCB8BF5CB0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{8E1C465B-1DA9-4C2A-A6B5-082C55EFB95E}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E07C6980-EB71-4D19-A80A-7BEB80B635B1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0371C5D8-D5F5-4747-9810-D91D71D8C0E4}"
@@ -69,6 +79,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E49881A9-09F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F254F143-4704-4432-9995-20D87FA8BF8D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{10E5D5FA-09FE-4E7A-A8E0-377BC228ACCB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{8F44175A-3081-4CA8-90E7-9EE6754EACAA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{08A1F4D2-E4DA-4CD9-9107-89941EFEB79C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{E9E19E81-4AE0-412D-98EA-3B14694D3CA3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -199,6 +217,26 @@ Global
 		{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03D5F977-D2DA-4586-A662-C99B0E0EEC20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03D5F977-D2DA-4586-A662-C99B0E0EEC20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03D5F977-D2DA-4586-A662-C99B0E0EEC20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03D5F977-D2DA-4586-A662-C99B0E0EEC20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3FCA745-7F4D-4FB8-85A5-422AC92B2704}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3FCA745-7F4D-4FB8-85A5-422AC92B2704}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3FCA745-7F4D-4FB8-85A5-422AC92B2704}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3FCA745-7F4D-4FB8-85A5-422AC92B2704}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0277072-F248-47EF-A417-D2612987D899}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0277072-F248-47EF-A417-D2612987D899}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0277072-F248-47EF-A417-D2612987D899}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0277072-F248-47EF-A417-D2612987D899}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A86642C4-E388-4871-B9FB-A5FCB8BF5CB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A86642C4-E388-4871-B9FB-A5FCB8BF5CB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A86642C4-E388-4871-B9FB-A5FCB8BF5CB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A86642C4-E388-4871-B9FB-A5FCB8BF5CB0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E1C465B-1DA9-4C2A-A6B5-082C55EFB95E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E1C465B-1DA9-4C2A-A6B5-082C55EFB95E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E1C465B-1DA9-4C2A-A6B5-082C55EFB95E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E1C465B-1DA9-4C2A-A6B5-082C55EFB95E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -235,6 +273,14 @@ Global
 		{04AEB008-EE4F-44DE-A361-2DBD2D0FD6A4} = {F254F143-4704-4432-9995-20D87FA8BF8D}
 		{6485EED4-C313-4551-9865-8ADCED603629} = {F254F143-4704-4432-9995-20D87FA8BF8D}
 		{143AFE8A-3490-444C-A82D-6A375EB59F01} = {F254F143-4704-4432-9995-20D87FA8BF8D}
+		{03D5F977-D2DA-4586-A662-C99B0E0EEC20} = {10E5D5FA-09FE-4E7A-A8E0-377BC228ACCB}
+		{A3FCA745-7F4D-4FB8-85A5-422AC92B2704} = {10E5D5FA-09FE-4E7A-A8E0-377BC228ACCB}
+		{10E5D5FA-09FE-4E7A-A8E0-377BC228ACCB} = {E9E19E81-4AE0-412D-98EA-3B14694D3CA3}
+		{D0277072-F248-47EF-A417-D2612987D899} = {8F44175A-3081-4CA8-90E7-9EE6754EACAA}
+		{A86642C4-E388-4871-B9FB-A5FCB8BF5CB0} = {8F44175A-3081-4CA8-90E7-9EE6754EACAA}
+		{8F44175A-3081-4CA8-90E7-9EE6754EACAA} = {E9E19E81-4AE0-412D-98EA-3B14694D3CA3}
+		{8E1C465B-1DA9-4C2A-A6B5-082C55EFB95E} = {08A1F4D2-E4DA-4CD9-9107-89941EFEB79C}
+		{08A1F4D2-E4DA-4CD9-9107-89941EFEB79C} = {E9E19E81-4AE0-412D-98EA-3B14694D3CA3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5868B757-D821-41FC-952E-2113A0519506}
diff --git a/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln b/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
index bd3042ee1575f..532e2126b4feb 100644
--- a/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
+++ b/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
@@ -1,8 +1,16 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{63551298-BFD4-43FC-8465-AC454228B83C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{401537CC-AF2E-48C5-A82A-5079C68FE837}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{5BBB128E-BA8A-4ABD-9F73-1B5AD48B0A04}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent", "..\System.Collections.Concurrent\ref\System.Collections.Concurrent.csproj", "{9E0438E1-8DD1-42CB-9C83-F88BBD3BC051}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\ref\System.Collections.csproj", "{2297998A-8E7C-48C9-8331-7755D80EEF09}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory", "..\System.Memory\ref\System.Memory.csproj", "{6C17FA4E-E870-44D6-9F76-B8A8FFCD2B52}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.ILGeneration", "..\System.Reflection.Emit.ILGeneration\ref\System.Reflection.Emit.ILGeneration.csproj", "{A3E53498-1F49-43C1-88A3-A6ED0A7819AA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Primitives", "..\System.Reflection.Primitives\ref\System.Reflection.Primitives.csproj", "{383F591C-2BCC-440E-ACC2-366B3736AF4A}"
@@ -17,6 +25,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{A5BAC1BF-9D24-4503-AF30-15641C27DDB2}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{8B81F45D-3001-48B5-B296-5152E8BAAA9F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{3C8AEE20-AEF0-45D1-9B57-CAE16EA5A5B0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration.Roslyn3.11", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.Roslyn3.11.csproj", "{202F5AD1-E8E5-4709-8D12-1DBCC6680BFB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration.Roslyn4.0", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.Roslyn4.0.csproj", "{F02259C7-5945-420C-876F-638342E8494D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration.Roslyn4.4", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.Roslyn4.4.csproj", "{17725877-C8D6-436A-AC72-BD13FB10E6C3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{5BEC4932-AA8C-4FA1-B2E2-0DC34CCA3986}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{4661A8AE-3760-4EEA-81B5-D90D076057F7}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Generator", "gen\System.Text.RegularExpressions.Generator.csproj", "{3699C8E2-C354-4AED-81DC-ECBAC3EFEB4B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions", "ref\System.Text.RegularExpressions.csproj", "{C043B00D-8662-43E4-9E87-8BB317059111}"
@@ -27,13 +49,31 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Unit.Tests", "tests\UnitTests\System.Text.RegularExpressions.Unit.Tests.csproj", "{A86931EC-34DC-40A8-BD8C-F5E13BDBA903}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{6CD7C9B0-1E53-403F-AB49-074F9C720BA1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{A7957DB5-DAAF-4EC6-A907-DAE81FFD0737}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{77185A65-80E0-4B99-B315-4B921E8E8D61}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{9A7A742B-6F06-4CE1-A9E3-3BEB2EE59CA2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A07B3142-4D2D-4F7B-99D1-365D95A3D7F6}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2ACCCAAB-F0CE-4839-82BD-F174861DEA78}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{15319A22-BC91-407B-A795-334DD05C82A0}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D8FD137E-6961-4629-A71A-53394897FE6B}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0D20E771-24BD-4F9E-BBD0-60156E8C44FC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D8FD137E-6961-4629-A71A-53394897FE6B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{89EBAAA4-CC3B-4915-AF3C-1747A72A0417}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{DD6A790D-D2F5-4382-9083-857CA0CA0492}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{BA0BB6E9-3323-47C8-B823-E9D0B7DB208A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{40206B78-552D-4843-9012-9FE6C771F2CB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,10 +85,26 @@ Global
 		{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
+		{401537CC-AF2E-48C5-A82A-5079C68FE837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{401537CC-AF2E-48C5-A82A-5079C68FE837}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{401537CC-AF2E-48C5-A82A-5079C68FE837}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{401537CC-AF2E-48C5-A82A-5079C68FE837}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BBB128E-BA8A-4ABD-9F73-1B5AD48B0A04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BBB128E-BA8A-4ABD-9F73-1B5AD48B0A04}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BBB128E-BA8A-4ABD-9F73-1B5AD48B0A04}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BBB128E-BA8A-4ABD-9F73-1B5AD48B0A04}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E0438E1-8DD1-42CB-9C83-F88BBD3BC051}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E0438E1-8DD1-42CB-9C83-F88BBD3BC051}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E0438E1-8DD1-42CB-9C83-F88BBD3BC051}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E0438E1-8DD1-42CB-9C83-F88BBD3BC051}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2297998A-8E7C-48C9-8331-7755D80EEF09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2297998A-8E7C-48C9-8331-7755D80EEF09}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2297998A-8E7C-48C9-8331-7755D80EEF09}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2297998A-8E7C-48C9-8331-7755D80EEF09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C17FA4E-E870-44D6-9F76-B8A8FFCD2B52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C17FA4E-E870-44D6-9F76-B8A8FFCD2B52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C17FA4E-E870-44D6-9F76-B8A8FFCD2B52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C17FA4E-E870-44D6-9F76-B8A8FFCD2B52}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A3E53498-1F49-43C1-88A3-A6ED0A7819AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A3E53498-1F49-43C1-88A3-A6ED0A7819AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3E53498-1F49-43C1-88A3-A6ED0A7819AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -77,6 +133,34 @@ Global
 		{A5BAC1BF-9D24-4503-AF30-15641C27DDB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A5BAC1BF-9D24-4503-AF30-15641C27DDB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A5BAC1BF-9D24-4503-AF30-15641C27DDB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B81F45D-3001-48B5-B296-5152E8BAAA9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B81F45D-3001-48B5-B296-5152E8BAAA9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B81F45D-3001-48B5-B296-5152E8BAAA9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B81F45D-3001-48B5-B296-5152E8BAAA9F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C8AEE20-AEF0-45D1-9B57-CAE16EA5A5B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C8AEE20-AEF0-45D1-9B57-CAE16EA5A5B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C8AEE20-AEF0-45D1-9B57-CAE16EA5A5B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C8AEE20-AEF0-45D1-9B57-CAE16EA5A5B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{202F5AD1-E8E5-4709-8D12-1DBCC6680BFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{202F5AD1-E8E5-4709-8D12-1DBCC6680BFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{202F5AD1-E8E5-4709-8D12-1DBCC6680BFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{202F5AD1-E8E5-4709-8D12-1DBCC6680BFB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F02259C7-5945-420C-876F-638342E8494D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F02259C7-5945-420C-876F-638342E8494D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F02259C7-5945-420C-876F-638342E8494D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F02259C7-5945-420C-876F-638342E8494D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17725877-C8D6-436A-AC72-BD13FB10E6C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17725877-C8D6-436A-AC72-BD13FB10E6C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17725877-C8D6-436A-AC72-BD13FB10E6C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17725877-C8D6-436A-AC72-BD13FB10E6C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BEC4932-AA8C-4FA1-B2E2-0DC34CCA3986}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BEC4932-AA8C-4FA1-B2E2-0DC34CCA3986}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BEC4932-AA8C-4FA1-B2E2-0DC34CCA3986}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BEC4932-AA8C-4FA1-B2E2-0DC34CCA3986}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4661A8AE-3760-4EEA-81B5-D90D076057F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4661A8AE-3760-4EEA-81B5-D90D076057F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4661A8AE-3760-4EEA-81B5-D90D076057F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4661A8AE-3760-4EEA-81B5-D90D076057F7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3699C8E2-C354-4AED-81DC-ECBAC3EFEB4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3699C8E2-C354-4AED-81DC-ECBAC3EFEB4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3699C8E2-C354-4AED-81DC-ECBAC3EFEB4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -97,6 +181,26 @@ Global
 		{A86931EC-34DC-40A8-BD8C-F5E13BDBA903}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A86931EC-34DC-40A8-BD8C-F5E13BDBA903}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A86931EC-34DC-40A8-BD8C-F5E13BDBA903}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6CD7C9B0-1E53-403F-AB49-074F9C720BA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CD7C9B0-1E53-403F-AB49-074F9C720BA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6CD7C9B0-1E53-403F-AB49-074F9C720BA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6CD7C9B0-1E53-403F-AB49-074F9C720BA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7957DB5-DAAF-4EC6-A907-DAE81FFD0737}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7957DB5-DAAF-4EC6-A907-DAE81FFD0737}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7957DB5-DAAF-4EC6-A907-DAE81FFD0737}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7957DB5-DAAF-4EC6-A907-DAE81FFD0737}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77185A65-80E0-4B99-B315-4B921E8E8D61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77185A65-80E0-4B99-B315-4B921E8E8D61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77185A65-80E0-4B99-B315-4B921E8E8D61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77185A65-80E0-4B99-B315-4B921E8E8D61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A7A742B-6F06-4CE1-A9E3-3BEB2EE59CA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A7A742B-6F06-4CE1-A9E3-3BEB2EE59CA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A7A742B-6F06-4CE1-A9E3-3BEB2EE59CA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A7A742B-6F06-4CE1-A9E3-3BEB2EE59CA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A07B3142-4D2D-4F7B-99D1-365D95A3D7F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A07B3142-4D2D-4F7B-99D1-365D95A3D7F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A07B3142-4D2D-4F7B-99D1-365D95A3D7F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A07B3142-4D2D-4F7B-99D1-365D95A3D7F6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -105,17 +209,36 @@ Global
 		{63551298-BFD4-43FC-8465-AC454228B83C} = {2ACCCAAB-F0CE-4839-82BD-F174861DEA78}
 		{8EE1A7C4-3630-4900-8976-9B3ADAFF10DC} = {2ACCCAAB-F0CE-4839-82BD-F174861DEA78}
 		{A86931EC-34DC-40A8-BD8C-F5E13BDBA903} = {2ACCCAAB-F0CE-4839-82BD-F174861DEA78}
+		{401537CC-AF2E-48C5-A82A-5079C68FE837} = {15319A22-BC91-407B-A795-334DD05C82A0}
+		{9E0438E1-8DD1-42CB-9C83-F88BBD3BC051} = {15319A22-BC91-407B-A795-334DD05C82A0}
 		{2297998A-8E7C-48C9-8331-7755D80EEF09} = {15319A22-BC91-407B-A795-334DD05C82A0}
+		{6C17FA4E-E870-44D6-9F76-B8A8FFCD2B52} = {15319A22-BC91-407B-A795-334DD05C82A0}
 		{A3E53498-1F49-43C1-88A3-A6ED0A7819AA} = {15319A22-BC91-407B-A795-334DD05C82A0}
 		{383F591C-2BCC-440E-ACC2-366B3736AF4A} = {15319A22-BC91-407B-A795-334DD05C82A0}
 		{3719B896-4B09-4552-97C1-F18CFD595FCF} = {15319A22-BC91-407B-A795-334DD05C82A0}
 		{A5BAC1BF-9D24-4503-AF30-15641C27DDB2} = {15319A22-BC91-407B-A795-334DD05C82A0}
+		{8B81F45D-3001-48B5-B296-5152E8BAAA9F} = {15319A22-BC91-407B-A795-334DD05C82A0}
+		{5BEC4932-AA8C-4FA1-B2E2-0DC34CCA3986} = {15319A22-BC91-407B-A795-334DD05C82A0}
 		{C043B00D-8662-43E4-9E87-8BB317059111} = {15319A22-BC91-407B-A795-334DD05C82A0}
+		{5BBB128E-BA8A-4ABD-9F73-1B5AD48B0A04} = {D8FD137E-6961-4629-A71A-53394897FE6B}
+		{3C8AEE20-AEF0-45D1-9B57-CAE16EA5A5B0} = {D8FD137E-6961-4629-A71A-53394897FE6B}
+		{4661A8AE-3760-4EEA-81B5-D90D076057F7} = {D8FD137E-6961-4629-A71A-53394897FE6B}
+		{0409C086-D7CC-43F8-9762-C94FB1E47F5B} = {D8FD137E-6961-4629-A71A-53394897FE6B}
 		{C5B9BDED-632F-4698-B0D7-FD12A1918170} = {0D20E771-24BD-4F9E-BBD0-60156E8C44FC}
 		{19F5ED62-25AE-462C-B168-CA72F078FFA4} = {0D20E771-24BD-4F9E-BBD0-60156E8C44FC}
 		{77CDA838-6489-4816-8847-DE2C7F5E1DCE} = {0D20E771-24BD-4F9E-BBD0-60156E8C44FC}
+		{202F5AD1-E8E5-4709-8D12-1DBCC6680BFB} = {0D20E771-24BD-4F9E-BBD0-60156E8C44FC}
+		{F02259C7-5945-420C-876F-638342E8494D} = {0D20E771-24BD-4F9E-BBD0-60156E8C44FC}
+		{17725877-C8D6-436A-AC72-BD13FB10E6C3} = {0D20E771-24BD-4F9E-BBD0-60156E8C44FC}
 		{3699C8E2-C354-4AED-81DC-ECBAC3EFEB4B} = {0D20E771-24BD-4F9E-BBD0-60156E8C44FC}
-		{0409C086-D7CC-43F8-9762-C94FB1E47F5B} = {D8FD137E-6961-4629-A71A-53394897FE6B}
+		{6CD7C9B0-1E53-403F-AB49-074F9C720BA1} = {89EBAAA4-CC3B-4915-AF3C-1747A72A0417}
+		{A7957DB5-DAAF-4EC6-A907-DAE81FFD0737} = {89EBAAA4-CC3B-4915-AF3C-1747A72A0417}
+		{89EBAAA4-CC3B-4915-AF3C-1747A72A0417} = {40206B78-552D-4843-9012-9FE6C771F2CB}
+		{77185A65-80E0-4B99-B315-4B921E8E8D61} = {DD6A790D-D2F5-4382-9083-857CA0CA0492}
+		{9A7A742B-6F06-4CE1-A9E3-3BEB2EE59CA2} = {DD6A790D-D2F5-4382-9083-857CA0CA0492}
+		{DD6A790D-D2F5-4382-9083-857CA0CA0492} = {40206B78-552D-4843-9012-9FE6C771F2CB}
+		{A07B3142-4D2D-4F7B-99D1-365D95A3D7F6} = {BA0BB6E9-3323-47C8-B823-E9D0B7DB208A}
+		{BA0BB6E9-3323-47C8-B823-E9D0B7DB208A} = {40206B78-552D-4843-9012-9FE6C771F2CB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1ED4AB32-B7AA-478F-A96B-F725ACD0AABB}
diff --git a/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln b/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln
index 73a4f02e9d2b6..bde719faf80f0 100644
--- a/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln
+++ b/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln
@@ -1,8 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7A3FDF55-70D1-42F5-9231-8F7CAB1B7097}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{1464649F-3E47-48BB-BE55-48D28E43E4B8}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{9BA0DBB0-99CF-4DEE-A43F-2B49854798AA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{96AF90CB-B031-4F19-A6F2-957715703954}"
@@ -13,6 +11,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessCont
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl.Tests", "tests\System.Threading.AccessControl.Tests.csproj", "{66D93328-0A8C-44AD-923B-AD3EB69A9518}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{73252B22-6231-4A95-9063-93D95234C527}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{28919E01-7456-44ED-A9E7-DCF8DA1D6065}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{E7302E2B-77D5-4BD5-A4C7-35E5BF96EACD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{F103C931-DC45-4BE8-A258-AB5B084B4372}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{9C3923C2-DCB9-42B1-827B-8FD9B41D19F3}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5ED4F157-B780-4295-9D2F-1DE86DBCDA24}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C7B6A687-7D71-47EC-AC21-8B8DEA7EF016}"
@@ -21,6 +29,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D7D1A40A-E3E
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8F3D0B8C-8814-4A4C-9663-837D46DA0AC6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{1E99F2C8-C75A-4A4B-A85B-69BD4692E02A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{EA1AB8BB-A371-415F-8E69-8D725F74113B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{9A85F46D-CB5B-4754-86DA-F51C1CCEE54D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{3621DFA4-3D4E-4287-9532-25BE4522B05E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,10 +47,6 @@ Global
 		{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
-		{1464649F-3E47-48BB-BE55-48D28E43E4B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1464649F-3E47-48BB-BE55-48D28E43E4B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1464649F-3E47-48BB-BE55-48D28E43E4B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1464649F-3E47-48BB-BE55-48D28E43E4B8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9BA0DBB0-99CF-4DEE-A43F-2B49854798AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9BA0DBB0-99CF-4DEE-A43F-2B49854798AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9BA0DBB0-99CF-4DEE-A43F-2B49854798AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +67,26 @@ Global
 		{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
+		{73252B22-6231-4A95-9063-93D95234C527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73252B22-6231-4A95-9063-93D95234C527}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73252B22-6231-4A95-9063-93D95234C527}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{73252B22-6231-4A95-9063-93D95234C527}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28919E01-7456-44ED-A9E7-DCF8DA1D6065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28919E01-7456-44ED-A9E7-DCF8DA1D6065}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28919E01-7456-44ED-A9E7-DCF8DA1D6065}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28919E01-7456-44ED-A9E7-DCF8DA1D6065}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E7302E2B-77D5-4BD5-A4C7-35E5BF96EACD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7302E2B-77D5-4BD5-A4C7-35E5BF96EACD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7302E2B-77D5-4BD5-A4C7-35E5BF96EACD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E7302E2B-77D5-4BD5-A4C7-35E5BF96EACD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F103C931-DC45-4BE8-A258-AB5B084B4372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F103C931-DC45-4BE8-A258-AB5B084B4372}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F103C931-DC45-4BE8-A258-AB5B084B4372}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F103C931-DC45-4BE8-A258-AB5B084B4372}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C3923C2-DCB9-42B1-827B-8FD9B41D19F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C3923C2-DCB9-42B1-827B-8FD9B41D19F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C3923C2-DCB9-42B1-827B-8FD9B41D19F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C3923C2-DCB9-42B1-827B-8FD9B41D19F3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -62,11 +94,18 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{7A3FDF55-70D1-42F5-9231-8F7CAB1B7097} = {5ED4F157-B780-4295-9D2F-1DE86DBCDA24}
 		{66D93328-0A8C-44AD-923B-AD3EB69A9518} = {5ED4F157-B780-4295-9D2F-1DE86DBCDA24}
-		{1464649F-3E47-48BB-BE55-48D28E43E4B8} = {C7B6A687-7D71-47EC-AC21-8B8DEA7EF016}
 		{9BA0DBB0-99CF-4DEE-A43F-2B49854798AA} = {C7B6A687-7D71-47EC-AC21-8B8DEA7EF016}
 		{96AF90CB-B031-4F19-A6F2-957715703954} = {C7B6A687-7D71-47EC-AC21-8B8DEA7EF016}
 		{6EA32BE1-8B5E-4807-B641-E7556C1E2C9D} = {D7D1A40A-E3E6-45DF-82CF-5BEE62109C70}
 		{6A444824-8479-4DB5-8DCA-9F50353ADE29} = {8F3D0B8C-8814-4A4C-9663-837D46DA0AC6}
+		{73252B22-6231-4A95-9063-93D95234C527} = {1E99F2C8-C75A-4A4B-A85B-69BD4692E02A}
+		{28919E01-7456-44ED-A9E7-DCF8DA1D6065} = {1E99F2C8-C75A-4A4B-A85B-69BD4692E02A}
+		{1E99F2C8-C75A-4A4B-A85B-69BD4692E02A} = {3621DFA4-3D4E-4287-9532-25BE4522B05E}
+		{E7302E2B-77D5-4BD5-A4C7-35E5BF96EACD} = {EA1AB8BB-A371-415F-8E69-8D725F74113B}
+		{F103C931-DC45-4BE8-A258-AB5B084B4372} = {EA1AB8BB-A371-415F-8E69-8D725F74113B}
+		{EA1AB8BB-A371-415F-8E69-8D725F74113B} = {3621DFA4-3D4E-4287-9532-25BE4522B05E}
+		{9C3923C2-DCB9-42B1-827B-8FD9B41D19F3} = {9A85F46D-CB5B-4754-86DA-F51C1CCEE54D}
+		{9A85F46D-CB5B-4754-86DA-F51C1CCEE54D} = {3621DFA4-3D4E-4287-9532-25BE4522B05E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6F3B4C7D-242F-4FAD-AB68-E3CE4552686F}
diff --git a/src/libraries/System.Threading.Channels/System.Threading.Channels.sln b/src/libraries/System.Threading.Channels/System.Threading.Channels.sln
index 06e1cf1b730ee..9c46a0e83d082 100644
--- a/src/libraries/System.Threading.Channels/System.Threading.Channels.sln
+++ b/src/libraries/System.Threading.Channels/System.Threading.Channels.sln
@@ -1,8 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C1F10802-5F76-472B-B164-C1D181DB5EBC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{CFA034DE-BEB3-4E06-945A-F8FA8F6A463A}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{6B242CF0-6FFA-46D4-A31A-8A1EDCFDAB60}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9158C7E3-284E-4D6F-BA23-B7534683E265}"
@@ -15,6 +13,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels.Tests", "tests\System.Threading.Channels.Tests.csproj", "{845BFFC3-14F2-402E-81E5-B487D41B7CD9}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{2AD46684-8EC5-4ABB-894E-E5D737225B45}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{67F35676-A50A-4509-A338-901BCC63FED4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{65AF6A62-13E9-43EB-A117-B4F1E1D86CE6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{A6A0F156-4AC7-4B7C-8DD8-3D1105506F1D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{FA715337-7A3E-4812-922F-D73424FFF2E3}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{07CE01C8-BDC8-4CED-AA33-6F3B35935CB6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{42E20B4D-6489-4096-8DC3-A0C20D19B1D6}"
@@ -23,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F69B62DE-61A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D3FF5D0E-208E-408F-97AD-C81EB31BB115}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{E719C436-7E71-4A0D-A76D-90CC13B5A5E7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{0863620E-F072-401C-B6CD-C8867C53CDFF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{027C3963-9C18-42EF-AD34-6DF010301499}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{20BF5207-0ECC-4975-A26E-29E2340EF131}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,10 +49,6 @@ Global
 		{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
-		{CFA034DE-BEB3-4E06-945A-F8FA8F6A463A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFA034DE-BEB3-4E06-945A-F8FA8F6A463A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFA034DE-BEB3-4E06-945A-F8FA8F6A463A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CFA034DE-BEB3-4E06-945A-F8FA8F6A463A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6B242CF0-6FFA-46D4-A31A-8A1EDCFDAB60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6B242CF0-6FFA-46D4-A31A-8A1EDCFDAB60}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6B242CF0-6FFA-46D4-A31A-8A1EDCFDAB60}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,6 +73,26 @@ Global
 		{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
+		{2AD46684-8EC5-4ABB-894E-E5D737225B45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2AD46684-8EC5-4ABB-894E-E5D737225B45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2AD46684-8EC5-4ABB-894E-E5D737225B45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2AD46684-8EC5-4ABB-894E-E5D737225B45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67F35676-A50A-4509-A338-901BCC63FED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67F35676-A50A-4509-A338-901BCC63FED4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67F35676-A50A-4509-A338-901BCC63FED4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67F35676-A50A-4509-A338-901BCC63FED4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65AF6A62-13E9-43EB-A117-B4F1E1D86CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65AF6A62-13E9-43EB-A117-B4F1E1D86CE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65AF6A62-13E9-43EB-A117-B4F1E1D86CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65AF6A62-13E9-43EB-A117-B4F1E1D86CE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6A0F156-4AC7-4B7C-8DD8-3D1105506F1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6A0F156-4AC7-4B7C-8DD8-3D1105506F1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6A0F156-4AC7-4B7C-8DD8-3D1105506F1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6A0F156-4AC7-4B7C-8DD8-3D1105506F1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA715337-7A3E-4812-922F-D73424FFF2E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA715337-7A3E-4812-922F-D73424FFF2E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA715337-7A3E-4812-922F-D73424FFF2E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA715337-7A3E-4812-922F-D73424FFF2E3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -68,12 +100,19 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{C1F10802-5F76-472B-B164-C1D181DB5EBC} = {07CE01C8-BDC8-4CED-AA33-6F3B35935CB6}
 		{845BFFC3-14F2-402E-81E5-B487D41B7CD9} = {07CE01C8-BDC8-4CED-AA33-6F3B35935CB6}
-		{CFA034DE-BEB3-4E06-945A-F8FA8F6A463A} = {42E20B4D-6489-4096-8DC3-A0C20D19B1D6}
 		{6B242CF0-6FFA-46D4-A31A-8A1EDCFDAB60} = {42E20B4D-6489-4096-8DC3-A0C20D19B1D6}
 		{9158C7E3-284E-4D6F-BA23-B7534683E265} = {42E20B4D-6489-4096-8DC3-A0C20D19B1D6}
 		{3D984937-E378-411E-8943-5B5DB23944F5} = {F69B62DE-61AD-4978-81C4-C095B62B5B04}
 		{E427C88B-655E-43F9-A0C0-AA54D01BDBDF} = {F69B62DE-61AD-4978-81C4-C095B62B5B04}
 		{4CFA1610-00D7-4651-82C8-A7504C475837} = {D3FF5D0E-208E-408F-97AD-C81EB31BB115}
+		{2AD46684-8EC5-4ABB-894E-E5D737225B45} = {E719C436-7E71-4A0D-A76D-90CC13B5A5E7}
+		{67F35676-A50A-4509-A338-901BCC63FED4} = {E719C436-7E71-4A0D-A76D-90CC13B5A5E7}
+		{E719C436-7E71-4A0D-A76D-90CC13B5A5E7} = {20BF5207-0ECC-4975-A26E-29E2340EF131}
+		{65AF6A62-13E9-43EB-A117-B4F1E1D86CE6} = {0863620E-F072-401C-B6CD-C8867C53CDFF}
+		{A6A0F156-4AC7-4B7C-8DD8-3D1105506F1D} = {0863620E-F072-401C-B6CD-C8867C53CDFF}
+		{0863620E-F072-401C-B6CD-C8867C53CDFF} = {20BF5207-0ECC-4975-A26E-29E2340EF131}
+		{FA715337-7A3E-4812-922F-D73424FFF2E3} = {027C3963-9C18-42EF-AD34-6DF010301499}
+		{027C3963-9C18-42EF-AD34-6DF010301499} = {20BF5207-0ECC-4975-A26E-29E2340EF131}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {32969D61-FEC0-4702-A3D4-88EC58F8ED5A}
diff --git a/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln b/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln
index 4de5d554a3f9b..65575c7acc17f 100644
--- a/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln
+++ b/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln
@@ -19,7 +19,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Overlapped
 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", "{4741C000-E701-406A-93B9-ABE5A5CF3D1C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{034CAAEB-FF8A-4EC7-AA23-838E8D212279}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8B1F1ACE-FD0A-4083-8DE6-8148C541A2CA}"
 EndProject
@@ -27,6 +37,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D07DC3DB-723
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1CC21763-DACE-400F-808F-7B9DCF90DCBA}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4741C000-E701-406A-93B9-ABE5A5CF3D1C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{1170143C-D620-429E-B55E-4201C9C7F82A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{0CB511B6-7611-48B6-86A6-7F5EEFB871BD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C3438661-C457-4E2B-A16D-584688B369BB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{8468914A-B50E-4DB5-95F8-AA5344CD9FB0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -265,13 +285,117 @@ Global
 		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Checked|arm64.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
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Debug|x64.Build.0 = Debug|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Debug|x86.Build.0 = Debug|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Release|arm.ActiveCfg = Release|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Release|x64.ActiveCfg = Release|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Release|x64.Build.0 = Release|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Release|x86.ActiveCfg = Release|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Release|x86.Build.0 = Release|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Debug|x64.Build.0 = Debug|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Debug|x86.Build.0 = Debug|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Release|arm.ActiveCfg = Release|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Release|x64.ActiveCfg = Release|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Release|x64.Build.0 = Release|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Release|x86.ActiveCfg = Release|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Release|x86.Build.0 = Release|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Debug|x64.Build.0 = Debug|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Debug|x86.Build.0 = Debug|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Release|arm.ActiveCfg = Release|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Release|x64.ActiveCfg = Release|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Release|x64.Build.0 = Release|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Release|x86.ActiveCfg = Release|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Release|x86.Build.0 = Release|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Debug|x64.Build.0 = Debug|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Debug|x86.Build.0 = Debug|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Release|arm.ActiveCfg = Release|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Release|x64.ActiveCfg = Release|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Release|x64.Build.0 = Release|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Release|x86.ActiveCfg = Release|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Release|x86.Build.0 = Release|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Debug|x64.Build.0 = Debug|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Debug|x86.Build.0 = Debug|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Release|arm.ActiveCfg = Release|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Release|arm64.ActiveCfg = Release|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Release|x64.ActiveCfg = Release|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Release|x64.Build.0 = Release|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Release|x86.ActiveCfg = Release|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Release|x86.Build.0 = Release|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{2F704A4A-944B-487C-BB11-D66CA63F3B05} = {4741C000-E701-406A-93B9-ABE5A5CF3D1C}
-		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF} = {4741C000-E701-406A-93B9-ABE5A5CF3D1C}
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05} = {034CAAEB-FF8A-4EC7-AA23-838E8D212279}
 		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F} = {8B1F1ACE-FD0A-4083-8DE6-8148C541A2CA}
 		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1} = {8B1F1ACE-FD0A-4083-8DE6-8148C541A2CA}
 		{8BAAF37B-C3C1-4DED-A89A-5513AE866360} = {D07DC3DB-723F-41C6-99A0-56F395D4D055}
@@ -280,6 +404,15 @@ Global
 		{4687BA7A-AF17-43B9-BB8A-5B802FDD4482} = {1CC21763-DACE-400F-808F-7B9DCF90DCBA}
 		{765BE4C9-9DB4-42AF-A4A5-9BA3CCA341A4} = {1CC21763-DACE-400F-808F-7B9DCF90DCBA}
 		{05F39036-EF46-438F-8033-084B5C14832B} = {1CC21763-DACE-400F-808F-7B9DCF90DCBA}
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF} = {4741C000-E701-406A-93B9-ABE5A5CF3D1C}
+		{2CBEE8BD-6E52-4B6B-BE53-590241EC95EF} = {1170143C-D620-429E-B55E-4201C9C7F82A}
+		{0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C} = {1170143C-D620-429E-B55E-4201C9C7F82A}
+		{1170143C-D620-429E-B55E-4201C9C7F82A} = {8468914A-B50E-4DB5-95F8-AA5344CD9FB0}
+		{0CB7E6B4-912F-4CEE-B5BD-55DF6A31EAEF} = {0CB511B6-7611-48B6-86A6-7F5EEFB871BD}
+		{AD312772-BF6F-4B14-84A7-3D6F2A521E1F} = {0CB511B6-7611-48B6-86A6-7F5EEFB871BD}
+		{0CB511B6-7611-48B6-86A6-7F5EEFB871BD} = {8468914A-B50E-4DB5-95F8-AA5344CD9FB0}
+		{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6} = {C3438661-C457-4E2B-A16D-584688B369BB}
+		{C3438661-C457-4E2B-A16D-584688B369BB} = {8468914A-B50E-4DB5-95F8-AA5344CD9FB0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E07B568D-46A8-4A3F-86A3-2710CA761847}
diff --git a/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln b/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln
index 0b6bbc3dea75f..2778a3fb6a644 100644
--- a/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln
+++ b/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln
@@ -5,8 +5,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfac
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{F59F4FD7-EA00-47EA-A09A-6F76CB079F9B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{965D1F05-364B-4F4B-B43C-442BC933CC9C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{394FA814-CF72-447D-AAE1-1B92CD63205D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{25495BDC-0614-4FAC-B6EA-DF3F0E35A871}"
@@ -17,6 +15,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.RateLimiti
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.RateLimiting.Tests", "tests\System.Threading.RateLimiting.Tests.csproj", "{AE81EE9F-1240-4AF1-BF21-7F451B7859E5}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{2074D793-BE72-4128-BD17-6EF83FD69DD1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{305658CF-339B-486F-B58E-C85A31831527}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{B8A268C9-A2CD-479E-B03E-2B405F88D070}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{B4573176-B36D-4621-9791-77D4508330A4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{4F94EABD-404C-496C-BC15-3EE87F6E6B59}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{111B1B5B-A004-4C05-9A8C-E0931DADA5FB}"
@@ -25,6 +33,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{85204CF5-0C8
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{399BE36D-F2D9-420A-AA09-455D4BF52057}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{C28129A1-6D6F-4B06-B1FA-ADD0A6DFA7C2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{5B944921-2830-43CF-92C2-11D6FDAD14B9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C0815C13-99E8-44C2-B35F-31E22A3DA527}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{C57F8858-D3FE-4C08-8D13-DDFCD82350EC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +59,6 @@ Global
 		{F59F4FD7-EA00-47EA-A09A-6F76CB079F9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F59F4FD7-EA00-47EA-A09A-6F76CB079F9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F59F4FD7-EA00-47EA-A09A-6F76CB079F9B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{965D1F05-364B-4F4B-B43C-442BC933CC9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{965D1F05-364B-4F4B-B43C-442BC933CC9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{965D1F05-364B-4F4B-B43C-442BC933CC9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{965D1F05-364B-4F4B-B43C-442BC933CC9C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{394FA814-CF72-447D-AAE1-1B92CD63205D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{394FA814-CF72-447D-AAE1-1B92CD63205D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{394FA814-CF72-447D-AAE1-1B92CD63205D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -67,6 +79,26 @@ Global
 		{AE81EE9F-1240-4AF1-BF21-7F451B7859E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AE81EE9F-1240-4AF1-BF21-7F451B7859E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AE81EE9F-1240-4AF1-BF21-7F451B7859E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2074D793-BE72-4128-BD17-6EF83FD69DD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2074D793-BE72-4128-BD17-6EF83FD69DD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2074D793-BE72-4128-BD17-6EF83FD69DD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2074D793-BE72-4128-BD17-6EF83FD69DD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{305658CF-339B-486F-B58E-C85A31831527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{305658CF-339B-486F-B58E-C85A31831527}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{305658CF-339B-486F-B58E-C85A31831527}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{305658CF-339B-486F-B58E-C85A31831527}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8A268C9-A2CD-479E-B03E-2B405F88D070}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8A268C9-A2CD-479E-B03E-2B405F88D070}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8A268C9-A2CD-479E-B03E-2B405F88D070}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8A268C9-A2CD-479E-B03E-2B405F88D070}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4573176-B36D-4621-9791-77D4508330A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4573176-B36D-4621-9791-77D4508330A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4573176-B36D-4621-9791-77D4508330A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4573176-B36D-4621-9791-77D4508330A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F94EABD-404C-496C-BC15-3EE87F6E6B59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F94EABD-404C-496C-BC15-3EE87F6E6B59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F94EABD-404C-496C-BC15-3EE87F6E6B59}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F94EABD-404C-496C-BC15-3EE87F6E6B59}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -78,9 +110,16 @@ Global
 		{FD274A80-0D68-48A0-9AC7-279C9E69BC63} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB}
 		{F59F4FD7-EA00-47EA-A09A-6F76CB079F9B} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}
 		{CD96AFE9-0F7F-42FA-BBDA-F57EDCBB4609} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}
-		{965D1F05-364B-4F4B-B43C-442BC933CC9C} = {399BE36D-F2D9-420A-AA09-455D4BF52057}
 		{394FA814-CF72-447D-AAE1-1B92CD63205D} = {399BE36D-F2D9-420A-AA09-455D4BF52057}
 		{25495BDC-0614-4FAC-B6EA-DF3F0E35A871} = {399BE36D-F2D9-420A-AA09-455D4BF52057}
+		{2074D793-BE72-4128-BD17-6EF83FD69DD1} = {C28129A1-6D6F-4B06-B1FA-ADD0A6DFA7C2}
+		{305658CF-339B-486F-B58E-C85A31831527} = {C28129A1-6D6F-4B06-B1FA-ADD0A6DFA7C2}
+		{C28129A1-6D6F-4B06-B1FA-ADD0A6DFA7C2} = {C57F8858-D3FE-4C08-8D13-DDFCD82350EC}
+		{B8A268C9-A2CD-479E-B03E-2B405F88D070} = {5B944921-2830-43CF-92C2-11D6FDAD14B9}
+		{B4573176-B36D-4621-9791-77D4508330A4} = {5B944921-2830-43CF-92C2-11D6FDAD14B9}
+		{5B944921-2830-43CF-92C2-11D6FDAD14B9} = {C57F8858-D3FE-4C08-8D13-DDFCD82350EC}
+		{4F94EABD-404C-496C-BC15-3EE87F6E6B59} = {C0815C13-99E8-44C2-B35F-31E22A3DA527}
+		{C0815C13-99E8-44C2-B35F-31E22A3DA527} = {C57F8858-D3FE-4C08-8D13-DDFCD82350EC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {25036AEF-71B3-4C8A-891F-0350414F9A23}
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 b35a72dec43ef..cb2cf47a20186 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,8 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{48428161-C841-43D4-8BD3-195A3D5C36C5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{D32DCB14-03AA-4F31-B5C8-C8512BB3CDB6}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{986667FC-4DA5-4496-B998-7DEB9879B180}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C4865002-095A-4B99-A737-216DC112ACA4}"
@@ -15,6 +13,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Data
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{9F1E4720-AC8C-40BD-AB5D-67C2A9426D10}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{8B8A555E-DC83-47DE-A730-D95EFC82ECBD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{6844D905-EFFE-40AC-8012-E33483780476}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{F7FA210C-6D0C-419D-A13F-C2E1F846E731}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{D2727CE8-7A93-458F-B232-4B470E1BB598}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D7C6E667-E868-423C-883D-CBDE73BFF66E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{AA3208A1-2A91-46D3-B09C-1A9CCF90235E}"
@@ -23,6 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E6ED6A93-597
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D4D4FFCB-0DAF-4CDC-8945-7B31D2197D66}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{AF7C2885-ABE5-4636-B583-5F40FBB47B3A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{B3784B87-6E0A-41A1-B82D-05AE560F82CE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{62CAF4CA-64E5-4023-ACE0-79B3071221ED}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{7484FF57-320D-436A-B73D-6A9E436970AC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,10 +49,6 @@ Global
 		{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
-		{D32DCB14-03AA-4F31-B5C8-C8512BB3CDB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D32DCB14-03AA-4F31-B5C8-C8512BB3CDB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D32DCB14-03AA-4F31-B5C8-C8512BB3CDB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D32DCB14-03AA-4F31-B5C8-C8512BB3CDB6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{986667FC-4DA5-4496-B998-7DEB9879B180}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{986667FC-4DA5-4496-B998-7DEB9879B180}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{986667FC-4DA5-4496-B998-7DEB9879B180}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,6 +73,26 @@ Global
 		{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
+		{9F1E4720-AC8C-40BD-AB5D-67C2A9426D10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F1E4720-AC8C-40BD-AB5D-67C2A9426D10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F1E4720-AC8C-40BD-AB5D-67C2A9426D10}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F1E4720-AC8C-40BD-AB5D-67C2A9426D10}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B8A555E-DC83-47DE-A730-D95EFC82ECBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B8A555E-DC83-47DE-A730-D95EFC82ECBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B8A555E-DC83-47DE-A730-D95EFC82ECBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B8A555E-DC83-47DE-A730-D95EFC82ECBD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6844D905-EFFE-40AC-8012-E33483780476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6844D905-EFFE-40AC-8012-E33483780476}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6844D905-EFFE-40AC-8012-E33483780476}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6844D905-EFFE-40AC-8012-E33483780476}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7FA210C-6D0C-419D-A13F-C2E1F846E731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7FA210C-6D0C-419D-A13F-C2E1F846E731}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7FA210C-6D0C-419D-A13F-C2E1F846E731}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7FA210C-6D0C-419D-A13F-C2E1F846E731}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2727CE8-7A93-458F-B232-4B470E1BB598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2727CE8-7A93-458F-B232-4B470E1BB598}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2727CE8-7A93-458F-B232-4B470E1BB598}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2727CE8-7A93-458F-B232-4B470E1BB598}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -68,12 +100,19 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{48428161-C841-43D4-8BD3-195A3D5C36C5} = {D7C6E667-E868-423C-883D-CBDE73BFF66E}
 		{51B191E6-C503-4949-8AD0-CF338FE13ADB} = {D7C6E667-E868-423C-883D-CBDE73BFF66E}
-		{D32DCB14-03AA-4F31-B5C8-C8512BB3CDB6} = {AA3208A1-2A91-46D3-B09C-1A9CCF90235E}
 		{986667FC-4DA5-4496-B998-7DEB9879B180} = {AA3208A1-2A91-46D3-B09C-1A9CCF90235E}
 		{C4865002-095A-4B99-A737-216DC112ACA4} = {AA3208A1-2A91-46D3-B09C-1A9CCF90235E}
 		{784D5C28-1B02-4DF5-A95F-5F453FD96828} = {E6ED6A93-5971-4E87-972C-23E80F6E0CFC}
 		{BD042162-B4E2-45AC-8225-699F25478852} = {E6ED6A93-5971-4E87-972C-23E80F6E0CFC}
 		{EA4AFF05-8124-4D15-A7A3-C731C21728BB} = {D4D4FFCB-0DAF-4CDC-8945-7B31D2197D66}
+		{9F1E4720-AC8C-40BD-AB5D-67C2A9426D10} = {AF7C2885-ABE5-4636-B583-5F40FBB47B3A}
+		{8B8A555E-DC83-47DE-A730-D95EFC82ECBD} = {AF7C2885-ABE5-4636-B583-5F40FBB47B3A}
+		{AF7C2885-ABE5-4636-B583-5F40FBB47B3A} = {7484FF57-320D-436A-B73D-6A9E436970AC}
+		{6844D905-EFFE-40AC-8012-E33483780476} = {B3784B87-6E0A-41A1-B82D-05AE560F82CE}
+		{F7FA210C-6D0C-419D-A13F-C2E1F846E731} = {B3784B87-6E0A-41A1-B82D-05AE560F82CE}
+		{B3784B87-6E0A-41A1-B82D-05AE560F82CE} = {7484FF57-320D-436A-B73D-6A9E436970AC}
+		{D2727CE8-7A93-458F-B232-4B470E1BB598} = {62CAF4CA-64E5-4023-ACE0-79B3071221ED}
+		{62CAF4CA-64E5-4023-ACE0-79B3071221ED} = {7484FF57-320D-436A-B73D-6A9E436970AC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0C9180F6-E88A-4F7E-801E-455E97B34F83}
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 79f8ceda7429e..6a408b66654ad 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
@@ -15,6 +15,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Para
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{D6BE1B91-9769-41CE-BC37-DEA7B00DD2D6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{90415C80-6EA6-4410-9A48-2D18BD6DA8E2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{740891AD-E810-4E48-8D09-56B06A2F0A40}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{137439ED-2A4C-4A92-B231-85A7769A19F3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{DAD04B5A-659C-4F01-91F8-A9B56B619356}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1BA41F95-8D9C-4C12-8A3A-9D31B27566E8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FBC5E558-FC17-4C58-B7F7-798E7CD58448}"
@@ -23,6 +33,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6D758B5C-C40
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A17071C3-99D6-40FF-947C-A15A9695FA91}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{8AD6A92E-4DF4-4C27-9A88-22AA03AEB40B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{2D0F222E-2CAA-460A-B2C2-AE5966DA9D5A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{8BC3A01B-5248-43F3-A74B-B3759A7ECEC0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{DABEB591-8150-4990-894C-F1AAD7B31367}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,6 +79,26 @@ Global
 		{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
+		{D6BE1B91-9769-41CE-BC37-DEA7B00DD2D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6BE1B91-9769-41CE-BC37-DEA7B00DD2D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6BE1B91-9769-41CE-BC37-DEA7B00DD2D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6BE1B91-9769-41CE-BC37-DEA7B00DD2D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90415C80-6EA6-4410-9A48-2D18BD6DA8E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90415C80-6EA6-4410-9A48-2D18BD6DA8E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90415C80-6EA6-4410-9A48-2D18BD6DA8E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90415C80-6EA6-4410-9A48-2D18BD6DA8E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{740891AD-E810-4E48-8D09-56B06A2F0A40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{740891AD-E810-4E48-8D09-56B06A2F0A40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{740891AD-E810-4E48-8D09-56B06A2F0A40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{740891AD-E810-4E48-8D09-56B06A2F0A40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{137439ED-2A4C-4A92-B231-85A7769A19F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{137439ED-2A4C-4A92-B231-85A7769A19F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{137439ED-2A4C-4A92-B231-85A7769A19F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{137439ED-2A4C-4A92-B231-85A7769A19F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DAD04B5A-659C-4F01-91F8-A9B56B619356}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAD04B5A-659C-4F01-91F8-A9B56B619356}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DAD04B5A-659C-4F01-91F8-A9B56B619356}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DAD04B5A-659C-4F01-91F8-A9B56B619356}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -74,6 +112,14 @@ Global
 		{135CC435-FD9E-4CE9-AFB9-593B105FBAFC} = {6D758B5C-C40A-4179-898E-B459165BF692}
 		{D0267433-C793-4450-94A0-1750388CE9CB} = {6D758B5C-C40A-4179-898E-B459165BF692}
 		{8F1FE81C-C15D-459A-8758-8B0853078EA7} = {A17071C3-99D6-40FF-947C-A15A9695FA91}
+		{D6BE1B91-9769-41CE-BC37-DEA7B00DD2D6} = {8AD6A92E-4DF4-4C27-9A88-22AA03AEB40B}
+		{90415C80-6EA6-4410-9A48-2D18BD6DA8E2} = {8AD6A92E-4DF4-4C27-9A88-22AA03AEB40B}
+		{8AD6A92E-4DF4-4C27-9A88-22AA03AEB40B} = {DABEB591-8150-4990-894C-F1AAD7B31367}
+		{740891AD-E810-4E48-8D09-56B06A2F0A40} = {2D0F222E-2CAA-460A-B2C2-AE5966DA9D5A}
+		{137439ED-2A4C-4A92-B231-85A7769A19F3} = {2D0F222E-2CAA-460A-B2C2-AE5966DA9D5A}
+		{2D0F222E-2CAA-460A-B2C2-AE5966DA9D5A} = {DABEB591-8150-4990-894C-F1AAD7B31367}
+		{DAD04B5A-659C-4F01-91F8-A9B56B619356} = {8BC3A01B-5248-43F3-A74B-B3759A7ECEC0}
+		{8BC3A01B-5248-43F3-A74B-B3759A7ECEC0} = {DABEB591-8150-4990-894C-F1AAD7B31367}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C94E269F-E48E-43B3-96D7-BB5D57A29820}
diff --git a/src/libraries/System.Threading.Thread/System.Threading.Thread.sln b/src/libraries/System.Threading.Thread/System.Threading.Thread.sln
index 8df7ae280c797..ed737e9fe8168 100644
--- a/src/libraries/System.Threading.Thread/System.Threading.Thread.sln
+++ b/src/libraries/System.Threading.Thread/System.Threading.Thread.sln
@@ -27,7 +27,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Thread.Tes
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\ref\System.Threading.csproj", "{EDC3F7A0-3C48-4962-9D28-4EC6B7560F32}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{576969A4-D9EB-4AD1-8767-240EDD9C23DF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{3B0827D8-B4B5-43C6-A316-862B10095973}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{205F2D7B-2F70-4C95-9378-198145111664}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{AC18CD17-1E29-4288-859D-D0F7B7DC5579}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{99025780-1164-4FD8-8E8E-BDE8F8703929}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{56E33627-D3D8-4893-898D-730A4DE8ED60}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{73AA6FCA-8FDC-41AA-8539-91562296190B}"
 EndProject
@@ -35,6 +45,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5B2563E3-FF5
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CC8272C5-AC82-4A51-B88C-018FF4284B25}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{576969A4-D9EB-4AD1-8767-240EDD9C23DF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{367F3353-6D8C-4AC0-B351-C848366BFB6A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{29AD62BC-AD6E-4BBB-ADFF-19D1FE37FAEC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{85ABE479-FDDE-4801-865E-F17829A66DDE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{E668657B-7AF8-4E07-A07C-3919797A8B8A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -357,13 +377,117 @@ Global
 		{EDC3F7A0-3C48-4962-9D28-4EC6B7560F32}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{EDC3F7A0-3C48-4962-9D28-4EC6B7560F32}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{EDC3F7A0-3C48-4962-9D28-4EC6B7560F32}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Debug|x64.Build.0 = Debug|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Debug|x86.Build.0 = Debug|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Release|arm.ActiveCfg = Release|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Release|arm64.ActiveCfg = Release|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Release|x64.ActiveCfg = Release|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Release|x64.Build.0 = Release|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Release|x86.ActiveCfg = Release|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Release|x86.Build.0 = Release|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3B0827D8-B4B5-43C6-A316-862B10095973}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Debug|x64.Build.0 = Debug|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Debug|x86.Build.0 = Debug|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Release|Any CPU.Build.0 = Release|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Release|arm.ActiveCfg = Release|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Release|arm64.ActiveCfg = Release|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Release|x64.ActiveCfg = Release|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Release|x64.Build.0 = Release|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Release|x86.ActiveCfg = Release|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Release|x86.Build.0 = Release|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{205F2D7B-2F70-4C95-9378-198145111664}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Debug|x64.Build.0 = Debug|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Debug|x86.Build.0 = Debug|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Release|arm.ActiveCfg = Release|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Release|arm64.ActiveCfg = Release|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Release|x64.ActiveCfg = Release|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Release|x64.Build.0 = Release|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Release|x86.ActiveCfg = Release|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Release|x86.Build.0 = Release|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Debug|x64.Build.0 = Debug|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Debug|x86.Build.0 = Debug|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Release|arm.ActiveCfg = Release|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Release|x64.ActiveCfg = Release|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Release|x64.Build.0 = Release|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Release|x86.ActiveCfg = Release|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Release|x86.Build.0 = Release|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Debug|x64.Build.0 = Debug|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Debug|x86.Build.0 = Debug|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Release|arm.ActiveCfg = Release|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Release|arm64.ActiveCfg = Release|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Release|x64.ActiveCfg = Release|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Release|x64.Build.0 = Release|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Release|x86.ActiveCfg = Release|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Release|x86.Build.0 = Release|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{99025780-1164-4FD8-8E8E-BDE8F8703929}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{B811926D-CFBB-4C22-80D2-0CCD566D980C} = {576969A4-D9EB-4AD1-8767-240EDD9C23DF}
-		{A73DCB15-F3DF-48CB-A4CA-62102E94122C} = {576969A4-D9EB-4AD1-8767-240EDD9C23DF}
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C} = {56E33627-D3D8-4893-898D-730A4DE8ED60}
 		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9} = {73AA6FCA-8FDC-41AA-8539-91562296190B}
 		{12A6F314-B08D-417D-82EC-0D8799D7C1A2} = {73AA6FCA-8FDC-41AA-8539-91562296190B}
 		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE} = {73AA6FCA-8FDC-41AA-8539-91562296190B}
@@ -376,6 +500,15 @@ Global
 		{793E2BF9-9E41-49A4-ACED-9FF37AEFACBE} = {CC8272C5-AC82-4A51-B88C-018FF4284B25}
 		{AD5C441F-05EA-452D-B3D2-514B304AA673} = {CC8272C5-AC82-4A51-B88C-018FF4284B25}
 		{EDC3F7A0-3C48-4962-9D28-4EC6B7560F32} = {CC8272C5-AC82-4A51-B88C-018FF4284B25}
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C} = {576969A4-D9EB-4AD1-8767-240EDD9C23DF}
+		{3B0827D8-B4B5-43C6-A316-862B10095973} = {367F3353-6D8C-4AC0-B351-C848366BFB6A}
+		{205F2D7B-2F70-4C95-9378-198145111664} = {367F3353-6D8C-4AC0-B351-C848366BFB6A}
+		{367F3353-6D8C-4AC0-B351-C848366BFB6A} = {E668657B-7AF8-4E07-A07C-3919797A8B8A}
+		{AC18CD17-1E29-4288-859D-D0F7B7DC5579} = {29AD62BC-AD6E-4BBB-ADFF-19D1FE37FAEC}
+		{BC33BD47-59B3-46A0-AC86-879F83E1CA1C} = {29AD62BC-AD6E-4BBB-ADFF-19D1FE37FAEC}
+		{29AD62BC-AD6E-4BBB-ADFF-19D1FE37FAEC} = {E668657B-7AF8-4E07-A07C-3919797A8B8A}
+		{99025780-1164-4FD8-8E8E-BDE8F8703929} = {85ABE479-FDDE-4801-865E-F17829A66DDE}
+		{85ABE479-FDDE-4801-865E-F17829A66DDE} = {E668657B-7AF8-4E07-A07C-3919797A8B8A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1D3E8D7C-10CB-4E04-B723-0B532932DF86}
diff --git a/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln b/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
index 4e130a65939c2..5b9ec36af16af 100644
--- a/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
+++ b/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
@@ -21,7 +21,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.ThreadPool
 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", "{3358539E-11F4-4294-8D94-A9A31E9F47F5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.ThreadPool.WindowsThreadPool.Tests", "tests\WindowsThreadPool\System.Threading.ThreadPool.WindowsThreadPool.Tests.csproj", "{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{EBA33C2D-BC48-4E26-8CC7-845BC9716574}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{F621411F-F1E9-47DF-AB80-268B18777990}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{1D6F62EA-A796-4A6D-985E-745D3086CAD1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DB513386-C3B1-4891-92E1-1BE5D38562DC}"
 EndProject
@@ -29,7 +41,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{1445280F-1F0
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6A32653B-8FAC-4B01-A0E0-E6379DE90A1A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.ThreadPool.WindowsThreadPool.Tests", "tests\WindowsThreadPool\System.Threading.ThreadPool.WindowsThreadPool.Tests.csproj", "{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3358539E-11F4-4294-8D94-A9A31E9F47F5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{AB444D50-7800-4DC8-A982-7C78E3BE7AE2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{5A4AE8D4-AD8F-4ED5-AA39-A702899A15E4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{20DF2649-B86C-448B-8689-2E2DB740469F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{4802A624-17FB-421B-A300-4F1B67DF9290}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -292,39 +312,155 @@ Global
 		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Debug|arm64.ActiveCfg = Debug|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Debug|x64.Build.0 = Debug|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Debug|x86.Build.0 = Debug|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Release|arm.ActiveCfg = Release|Any CPU
+		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Release|arm64.ActiveCfg = Release|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Release|x64.ActiveCfg = Release|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Release|x64.Build.0 = Release|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Release|x86.ActiveCfg = Release|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Release|x86.Build.0 = Release|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Checked|x64.Build.0 = Debug|Any CPU
 		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE}.Checked|x86.Build.0 = Debug|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Debug|x64.Build.0 = Debug|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Debug|x86.Build.0 = Debug|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Release|arm.ActiveCfg = Release|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Release|x64.ActiveCfg = Release|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Release|x64.Build.0 = Release|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Release|x86.ActiveCfg = Release|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Release|x86.Build.0 = Release|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Debug|x64.Build.0 = Debug|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Debug|x86.Build.0 = Debug|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Release|arm.ActiveCfg = Release|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Release|arm64.ActiveCfg = Release|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Release|x64.ActiveCfg = Release|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Release|x64.Build.0 = Release|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Release|x86.ActiveCfg = Release|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Release|x86.Build.0 = Release|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Debug|x64.Build.0 = Debug|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Debug|x86.Build.0 = Debug|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Release|arm.ActiveCfg = Release|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Release|x64.ActiveCfg = Release|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Release|x64.Build.0 = Release|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Release|x86.ActiveCfg = Release|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Release|x86.Build.0 = Release|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Debug|x64.Build.0 = Debug|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Debug|x86.Build.0 = Debug|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Release|arm.ActiveCfg = Release|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Release|x64.ActiveCfg = Release|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Release|x64.Build.0 = Release|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Release|x86.ActiveCfg = Release|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Release|x86.Build.0 = Release|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Debug|x64.Build.0 = Debug|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Debug|x86.Build.0 = Debug|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Release|arm.ActiveCfg = Release|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Release|x64.ActiveCfg = Release|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Release|x64.Build.0 = Release|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Release|x86.ActiveCfg = Release|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Release|x86.Build.0 = Release|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F621411F-F1E9-47DF-AB80-268B18777990}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{BEACD8A1-3C09-450E-931F-561D44986BFB} = {3358539E-11F4-4294-8D94-A9A31E9F47F5}
+		{BEACD8A1-3C09-450E-931F-561D44986BFB} = {1D6F62EA-A796-4A6D-985E-745D3086CAD1}
 		{CD477FC8-AF27-46A2-A451-4A2D4C11600D} = {DB513386-C3B1-4891-92E1-1BE5D38562DC}
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75} = {DB513386-C3B1-4891-92E1-1BE5D38562DC}
+		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE} = {DB513386-C3B1-4891-92E1-1BE5D38562DC}
 		{54E0AB0F-EB35-49AB-9A38-7C09FD7EC373} = {1445280F-1F07-45C3-93BC-D4025720B5FE}
-		{3156246A-939D-4232-90B3-FDE03A14BA90} = {6A32653B-8FAC-4B01-A0E0-E6379DE90A1A}
 		{B5732A3E-15DB-4BAA-A44C-41A7C29C68F0} = {1445280F-1F07-45C3-93BC-D4025720B5FE}
 		{3A5BA59D-C1B6-492F-BF2C-FDE2C274E9B3} = {1445280F-1F07-45C3-93BC-D4025720B5FE}
+		{3156246A-939D-4232-90B3-FDE03A14BA90} = {6A32653B-8FAC-4B01-A0E0-E6379DE90A1A}
 		{E8E31BA1-DC94-40F1-9606-6922941582DC} = {6A32653B-8FAC-4B01-A0E0-E6379DE90A1A}
 		{08FEC21B-875E-499A-B5CA-7D921B7A484B} = {6A32653B-8FAC-4B01-A0E0-E6379DE90A1A}
 		{54134937-585D-48D5-AB60-79493BE2C9E7} = {6A32653B-8FAC-4B01-A0E0-E6379DE90A1A}
 		{53A0D29E-8633-4FF8-AB0E-86EF331DD379} = {3358539E-11F4-4294-8D94-A9A31E9F47F5}
-		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75} = {DB513386-C3B1-4891-92E1-1BE5D38562DC}
-		{2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE} = {DB513386-C3B1-4891-92E1-1BE5D38562DC}
+		{DB9B5380-2F48-4C50-820C-FAFA254A2E3E} = {AB444D50-7800-4DC8-A982-7C78E3BE7AE2}
+		{EBA33C2D-BC48-4E26-8CC7-845BC9716574} = {AB444D50-7800-4DC8-A982-7C78E3BE7AE2}
+		{AB444D50-7800-4DC8-A982-7C78E3BE7AE2} = {4802A624-17FB-421B-A300-4F1B67DF9290}
+		{581F0BF4-60A6-4E22-AAB1-DC64C7D8D25B} = {5A4AE8D4-AD8F-4ED5-AA39-A702899A15E4}
+		{9B3CBB41-8D74-49C0-88BF-6CA1794A3DF3} = {5A4AE8D4-AD8F-4ED5-AA39-A702899A15E4}
+		{5A4AE8D4-AD8F-4ED5-AA39-A702899A15E4} = {4802A624-17FB-421B-A300-4F1B67DF9290}
+		{F621411F-F1E9-47DF-AB80-268B18777990} = {20DF2649-B86C-448B-8689-2E2DB740469F}
+		{20DF2649-B86C-448B-8689-2E2DB740469F} = {4802A624-17FB-421B-A300-4F1B67DF9290}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6124532E-4272-44A6-954B-A7B0FF9D694A}
diff --git a/src/libraries/System.Threading/System.Threading.sln b/src/libraries/System.Threading/System.Threading.sln
index 77302a842c78a..ff8d6d982954a 100644
--- a/src/libraries/System.Threading/System.Threading.sln
+++ b/src/libraries/System.Threading/System.Threading.sln
@@ -19,7 +19,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "src\Sys
 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", "{C50DDA85-E391-4BC7-BF37-758B9CD35CF3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{24A2CE1A-6995-477E-925D-BA928E909F36}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{1DEE16F0-CA56-4315-B87F-CF80C689A77C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{73F06253-A776-422E-B9AA-823991B32BA8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{A43B9D52-FCB0-4C2A-82B0-34377608DD98}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{B429DF7B-86B7-4134-BFCE-351300338853}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{6BC1276F-47F0-40C0-BA63-C89C4D4BA0C9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CCC80DF2-8B4E-497C-84A9-4E6344294566}"
 EndProject
@@ -27,6 +37,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A928B9C7-28E
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BEFD8C2C-3355-40A5-8C06-3CE0BFB66C36}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C50DDA85-E391-4BC7-BF37-758B9CD35CF3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{063A0284-C30F-4DEE-BFD8-EDC926C057CD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D58ED978-7B6A-43B7-9DBC-D11DA1268F7F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C7BB3EDC-0980-4B04-AE10-62AC9BD51FB9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{382C1313-228D-4211-9C54-AB54CE678707}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -265,13 +285,117 @@ Global
 		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Checked|arm64.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
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Debug|x64.Build.0 = Debug|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Debug|x86.Build.0 = Debug|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Release|arm.ActiveCfg = Release|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Release|arm64.ActiveCfg = Release|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Release|x64.ActiveCfg = Release|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Release|x64.Build.0 = Release|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Release|x86.ActiveCfg = Release|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Release|x86.Build.0 = Release|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{24A2CE1A-6995-477E-925D-BA928E909F36}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Debug|x64.Build.0 = Debug|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Debug|x86.Build.0 = Debug|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Release|arm.ActiveCfg = Release|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Release|x64.ActiveCfg = Release|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Release|x64.Build.0 = Release|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Release|x86.ActiveCfg = Release|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Release|x86.Build.0 = Release|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Debug|x64.Build.0 = Debug|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Debug|x86.Build.0 = Debug|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Release|arm.ActiveCfg = Release|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Release|arm64.ActiveCfg = Release|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Release|x64.ActiveCfg = Release|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Release|x64.Build.0 = Release|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Release|x86.ActiveCfg = Release|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Release|x86.Build.0 = Release|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{73F06253-A776-422E-B9AA-823991B32BA8}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Debug|x64.Build.0 = Debug|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Debug|x86.Build.0 = Debug|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Release|arm.ActiveCfg = Release|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Release|arm64.ActiveCfg = Release|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Release|x64.ActiveCfg = Release|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Release|x64.Build.0 = Release|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Release|x86.ActiveCfg = Release|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Release|x86.Build.0 = Release|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Debug|x64.Build.0 = Debug|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Debug|x86.Build.0 = Debug|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Release|arm.ActiveCfg = Release|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Release|x64.ActiveCfg = Release|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Release|x64.Build.0 = Release|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Release|x86.ActiveCfg = Release|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Release|x86.Build.0 = Release|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B429DF7B-86B7-4134-BFCE-351300338853}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{1F14F4DD-AE65-407B-9E10-F5786A847AD6} = {C50DDA85-E391-4BC7-BF37-758B9CD35CF3}
-		{F4D0710C-6A53-44F9-A28B-63F008FEF808} = {C50DDA85-E391-4BC7-BF37-758B9CD35CF3}
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6} = {6BC1276F-47F0-40C0-BA63-C89C4D4BA0C9}
 		{387778C0-0405-4FE2-9D85-034254EAAD46} = {CCC80DF2-8B4E-497C-84A9-4E6344294566}
 		{3DD929D8-346F-4CF3-B157-22E052F73A91} = {CCC80DF2-8B4E-497C-84A9-4E6344294566}
 		{AB7F1F45-5C20-40C7-B6DA-192B37012DD8} = {A928B9C7-28EC-4D20-9A63-87221C52EC87}
@@ -280,6 +404,15 @@ Global
 		{7B40C562-C082-451C-8281-5088EBFE0079} = {BEFD8C2C-3355-40A5-8C06-3CE0BFB66C36}
 		{C6F7ADFF-7D13-4773-B886-48F51809F73E} = {BEFD8C2C-3355-40A5-8C06-3CE0BFB66C36}
 		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49} = {BEFD8C2C-3355-40A5-8C06-3CE0BFB66C36}
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808} = {C50DDA85-E391-4BC7-BF37-758B9CD35CF3}
+		{24A2CE1A-6995-477E-925D-BA928E909F36} = {063A0284-C30F-4DEE-BFD8-EDC926C057CD}
+		{1DEE16F0-CA56-4315-B87F-CF80C689A77C} = {063A0284-C30F-4DEE-BFD8-EDC926C057CD}
+		{063A0284-C30F-4DEE-BFD8-EDC926C057CD} = {382C1313-228D-4211-9C54-AB54CE678707}
+		{73F06253-A776-422E-B9AA-823991B32BA8} = {D58ED978-7B6A-43B7-9DBC-D11DA1268F7F}
+		{A43B9D52-FCB0-4C2A-82B0-34377608DD98} = {D58ED978-7B6A-43B7-9DBC-D11DA1268F7F}
+		{D58ED978-7B6A-43B7-9DBC-D11DA1268F7F} = {382C1313-228D-4211-9C54-AB54CE678707}
+		{B429DF7B-86B7-4134-BFCE-351300338853} = {C7BB3EDC-0980-4B04-AE10-62AC9BD51FB9}
+		{C7BB3EDC-0980-4B04-AE10-62AC9BD51FB9} = {382C1313-228D-4211-9C54-AB54CE678707}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {859F6F1F-8DF9-4E85-B288-50B9149EDD81}
diff --git a/src/libraries/System.Transactions.Local/System.Transactions.Local.sln b/src/libraries/System.Transactions.Local/System.Transactions.Local.sln
index 79551dd2cbc43..6d5009f11eeb9 100644
--- a/src/libraries/System.Transactions.Local/System.Transactions.Local.sln
+++ b/src/libraries/System.Transactions.Local/System.Transactions.Local.sln
@@ -19,6 +19,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Transactions.Local",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Transactions.Local.Tests", "tests\System.Transactions.Local.Tests.csproj", "{C5519C4C-69AF-4437-8594-D2A019119988}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{EB7DBBB8-0923-48C1-AB88-F3FF987C2449}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{14F12A3F-AA5E-4F20-B8E6-DFCCEE1FBB71}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{2B4AEC4E-E5B8-402D-B938-65C8D8ED0248}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{5345D79E-E437-431E-BB9C-65AC54626DC0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{95F76D76-11E8-4551-8786-D304D698C91B}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E66BBFB5-F07D-4986-89C0-F0E395DD5BA1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B4E1F144-E017-4E02-8320-DB7467E42BF8}"
@@ -27,6 +37,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2ECC9D1A-2EF
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9D6D84CE-3891-482B-B7C0-0089CF93CF45}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{19FA1AAF-FBDF-4CF9-A432-8A98400E8598}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{29620C15-7580-40A6-A591-73A49C572FA2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{C394810F-6A50-48E6-BCAB-91C55AEB92AA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{770FE0B0-1496-4DBA-9E91-FAA63BE58272}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -73,6 +91,26 @@ Global
 		{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
+		{EB7DBBB8-0923-48C1-AB88-F3FF987C2449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB7DBBB8-0923-48C1-AB88-F3FF987C2449}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB7DBBB8-0923-48C1-AB88-F3FF987C2449}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB7DBBB8-0923-48C1-AB88-F3FF987C2449}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14F12A3F-AA5E-4F20-B8E6-DFCCEE1FBB71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14F12A3F-AA5E-4F20-B8E6-DFCCEE1FBB71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14F12A3F-AA5E-4F20-B8E6-DFCCEE1FBB71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14F12A3F-AA5E-4F20-B8E6-DFCCEE1FBB71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B4AEC4E-E5B8-402D-B938-65C8D8ED0248}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B4AEC4E-E5B8-402D-B938-65C8D8ED0248}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B4AEC4E-E5B8-402D-B938-65C8D8ED0248}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B4AEC4E-E5B8-402D-B938-65C8D8ED0248}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5345D79E-E437-431E-BB9C-65AC54626DC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5345D79E-E437-431E-BB9C-65AC54626DC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5345D79E-E437-431E-BB9C-65AC54626DC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5345D79E-E437-431E-BB9C-65AC54626DC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{95F76D76-11E8-4551-8786-D304D698C91B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95F76D76-11E8-4551-8786-D304D698C91B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95F76D76-11E8-4551-8786-D304D698C91B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95F76D76-11E8-4551-8786-D304D698C91B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -88,6 +126,14 @@ Global
 		{2A01A433-50B7-4CFA-AA76-CB51971535BB} = {2ECC9D1A-2EF1-4411-98D1-AFFCDAAF9D05}
 		{193FBAA0-BAE2-484A-BB0E-1ADDDC810FC9} = {2ECC9D1A-2EF1-4411-98D1-AFFCDAAF9D05}
 		{6BFF19CB-C412-4D12-AA55-68D61F69C4F7} = {9D6D84CE-3891-482B-B7C0-0089CF93CF45}
+		{EB7DBBB8-0923-48C1-AB88-F3FF987C2449} = {19FA1AAF-FBDF-4CF9-A432-8A98400E8598}
+		{14F12A3F-AA5E-4F20-B8E6-DFCCEE1FBB71} = {19FA1AAF-FBDF-4CF9-A432-8A98400E8598}
+		{19FA1AAF-FBDF-4CF9-A432-8A98400E8598} = {770FE0B0-1496-4DBA-9E91-FAA63BE58272}
+		{2B4AEC4E-E5B8-402D-B938-65C8D8ED0248} = {29620C15-7580-40A6-A591-73A49C572FA2}
+		{5345D79E-E437-431E-BB9C-65AC54626DC0} = {29620C15-7580-40A6-A591-73A49C572FA2}
+		{29620C15-7580-40A6-A591-73A49C572FA2} = {770FE0B0-1496-4DBA-9E91-FAA63BE58272}
+		{95F76D76-11E8-4551-8786-D304D698C91B} = {C394810F-6A50-48E6-BCAB-91C55AEB92AA}
+		{C394810F-6A50-48E6-BCAB-91C55AEB92AA} = {770FE0B0-1496-4DBA-9E91-FAA63BE58272}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {197B13C9-4EA6-408B-8EF6-B551B2A58A89}
diff --git a/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln b/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln
index d1e3fc2cd51c7..1b4d405697c17 100644
--- a/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln
+++ b/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln
@@ -25,6 +25,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Web.HttpUtility", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Web.HttpUtility.Tests", "tests\System.Web.HttpUtility.Tests.csproj", "{BA3C5AE7-937C-47E1-B861-1F149499889F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{56B60109-B617-4465-9043-F4B238E04CF9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{1163DCE9-17D8-492A-9AEE-D8C82A124393}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{D3CDFB2E-9376-4C0B-B09D-B1DC917080D1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{13353E72-F643-4528-8B76-C5C56620376A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{084801E3-5B7E-4738-9AC7-C592773519F9}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5A13596E-F762-470F-9B2C-92227CC6FF3F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E29510E3-01F1-4F13-885C-95690B2D2FDC}"
@@ -33,6 +43,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{DB94D23F-DB7
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{36DE8D3F-5AAF-4464-A544-AF32A37307F5}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{8BEACA54-0AFF-4D6A-9151-1BA656DF810D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{46233262-1BBC-4272-B4A3-1D8A2C963033}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{57BBC6ED-E0E4-40AE-8151-D78B45895839}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{50044BC6-C51B-445F-AB0E-3BFC9C4DEAA2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,6 +109,26 @@ Global
 		{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
+		{56B60109-B617-4465-9043-F4B238E04CF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56B60109-B617-4465-9043-F4B238E04CF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56B60109-B617-4465-9043-F4B238E04CF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56B60109-B617-4465-9043-F4B238E04CF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1163DCE9-17D8-492A-9AEE-D8C82A124393}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1163DCE9-17D8-492A-9AEE-D8C82A124393}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1163DCE9-17D8-492A-9AEE-D8C82A124393}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1163DCE9-17D8-492A-9AEE-D8C82A124393}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3CDFB2E-9376-4C0B-B09D-B1DC917080D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3CDFB2E-9376-4C0B-B09D-B1DC917080D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3CDFB2E-9376-4C0B-B09D-B1DC917080D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3CDFB2E-9376-4C0B-B09D-B1DC917080D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13353E72-F643-4528-8B76-C5C56620376A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13353E72-F643-4528-8B76-C5C56620376A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13353E72-F643-4528-8B76-C5C56620376A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13353E72-F643-4528-8B76-C5C56620376A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{084801E3-5B7E-4738-9AC7-C592773519F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{084801E3-5B7E-4738-9AC7-C592773519F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{084801E3-5B7E-4738-9AC7-C592773519F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{084801E3-5B7E-4738-9AC7-C592773519F9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -109,6 +147,14 @@ Global
 		{58FC2C69-816F-44D4-AE44-72F8864DFAE1} = {DB94D23F-DB79-455A-9C55-37403C9BE9F6}
 		{02855E32-AB9B-4893-A9E3-50620FCA1287} = {DB94D23F-DB79-455A-9C55-37403C9BE9F6}
 		{C294097C-8171-4FA2-9C58-11A7FE3BEBDA} = {36DE8D3F-5AAF-4464-A544-AF32A37307F5}
+		{56B60109-B617-4465-9043-F4B238E04CF9} = {8BEACA54-0AFF-4D6A-9151-1BA656DF810D}
+		{1163DCE9-17D8-492A-9AEE-D8C82A124393} = {8BEACA54-0AFF-4D6A-9151-1BA656DF810D}
+		{8BEACA54-0AFF-4D6A-9151-1BA656DF810D} = {50044BC6-C51B-445F-AB0E-3BFC9C4DEAA2}
+		{D3CDFB2E-9376-4C0B-B09D-B1DC917080D1} = {46233262-1BBC-4272-B4A3-1D8A2C963033}
+		{13353E72-F643-4528-8B76-C5C56620376A} = {46233262-1BBC-4272-B4A3-1D8A2C963033}
+		{46233262-1BBC-4272-B4A3-1D8A2C963033} = {50044BC6-C51B-445F-AB0E-3BFC9C4DEAA2}
+		{084801E3-5B7E-4738-9AC7-C592773519F9} = {57BBC6ED-E0E4-40AE-8151-D78B45895839}
+		{57BBC6ED-E0E4-40AE-8151-D78B45895839} = {50044BC6-C51B-445F-AB0E-3BFC9C4DEAA2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F217C7E2-5993-44CD-B205-72A0167F266F}
diff --git a/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln b/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln
index 4c5b9de73effe..6db9e2a03ffed 100644
--- a/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln
+++ b/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln
@@ -1,72 +1,490 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{FBB5EE77-1102-4F26-B849-A24205935920}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E51D8981-999E-4516-82BF-5766CE531E53}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{CC29474E-0893-4260-8EEF-40375C300736}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{8DF21599-94FF-4B57-8179-67DA3D54D005}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\System.Private.CoreLib\ref\System.Private.CoreLib.csproj", "{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{79A37A2A-E133-486E-9DB5-5FA5147184E1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{BF9DE7F9-08A1-4482-8F81-2895BB99D651}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\ref\System.Runtime.csproj", "{5CE615CA-7003-4F31-A151-9256239CD41F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{9A4570D2-9199-47AA-8178-52ECA60C3A08}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{0DC8A199-8AE6-4FE8-92F4-153D6521279A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{D50B3619-E571-4DCF-99CD-4C8982717C98}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{C1F9B6EA-2B79-4304-AB6C-6CB80BEC7F4E}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2B702044-D081-480E-877C-6CD7A7BDC726}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{099F43C3-B397-4871-AA29-0B32869E7B48}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{45BD3F1C-C44C-484B-8759-41BFCA7CEFF8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C881B8F0-59DE-411B-AA11-2729C3273BE2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{099F43C3-B397-4871-AA29-0B32869E7B48}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{B989E5AC-10EA-4BA6-B093-15448876C7BB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D5E0A88B-0CD6-456C-A9FC-B916D3A0A178}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{41782D1F-6C79-437E-AD20-DA5E9D4D274E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{B6F2B9D7-6C55-4EC0-8D1F-A497B4AD4B90}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm = Debug|arm
+		Debug|arm64 = Debug|arm64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm = Release|arm
+		Release|arm64 = Release|arm64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|arm = Checked|arm
+		Checked|arm64 = Checked|arm64
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Debug|Any CPU.Build.0 = Debug|x64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Debug|arm.ActiveCfg = Debug|arm
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Debug|arm.Build.0 = Debug|arm
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Debug|arm64.ActiveCfg = Debug|arm64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Debug|arm64.Build.0 = Debug|arm64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Debug|x64.ActiveCfg = Debug|x64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Debug|x64.Build.0 = Debug|x64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Debug|x86.ActiveCfg = Debug|x86
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Debug|x86.Build.0 = Debug|x86
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Release|Any CPU.ActiveCfg = Release|x64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Release|Any CPU.Build.0 = Release|x64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Release|arm.ActiveCfg = Release|arm
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Release|arm.Build.0 = Release|arm
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Release|arm64.ActiveCfg = Release|arm64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Release|arm64.Build.0 = Release|arm64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Release|x64.ActiveCfg = Release|x64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Release|x64.Build.0 = Release|x64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Release|x86.ActiveCfg = Release|x86
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Release|x86.Build.0 = Release|x86
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Checked|Any CPU.Build.0 = Checked|x64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Checked|arm.ActiveCfg = Checked|arm
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Checked|arm.Build.0 = Checked|arm
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Checked|arm64.ActiveCfg = Checked|arm64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Checked|arm64.Build.0 = Checked|arm64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Checked|x64.ActiveCfg = Checked|x64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Checked|x64.Build.0 = Checked|x64
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Checked|x86.ActiveCfg = Checked|x86
+		{FBB5EE77-1102-4F26-B849-A24205935920}.Checked|x86.Build.0 = Checked|x86
 		{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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Debug|x64.Build.0 = Debug|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Debug|x86.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
-		{CC29474E-0893-4260-8EEF-40375C300736}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC29474E-0893-4260-8EEF-40375C300736}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC29474E-0893-4260-8EEF-40375C300736}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC29474E-0893-4260-8EEF-40375C300736}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Release|arm.ActiveCfg = Release|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Release|x64.ActiveCfg = Release|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Release|x64.Build.0 = Release|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Release|x86.ActiveCfg = Release|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Release|x86.Build.0 = Release|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Debug|x64.Build.0 = Debug|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Debug|x86.Build.0 = Debug|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Release|arm.ActiveCfg = Release|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Release|x64.ActiveCfg = Release|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Release|x64.Build.0 = Release|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Release|x86.ActiveCfg = Release|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Release|x86.Build.0 = Release|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Debug|x64.Build.0 = Debug|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Debug|x86.Build.0 = Debug|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Release|arm.ActiveCfg = Release|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Release|x64.ActiveCfg = Release|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Release|x64.Build.0 = Release|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Release|x86.ActiveCfg = Release|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Release|x86.Build.0 = Release|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8DF21599-94FF-4B57-8179-67DA3D54D005}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Debug|x64.Build.0 = Debug|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Debug|x86.Build.0 = Debug|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Release|arm.ActiveCfg = Release|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Release|x64.ActiveCfg = Release|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Release|x64.Build.0 = Release|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Release|x86.ActiveCfg = Release|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Release|x86.Build.0 = Release|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Debug|x64.Build.0 = Debug|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Debug|x86.Build.0 = Debug|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Release|arm.ActiveCfg = Release|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Release|x64.ActiveCfg = Release|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Release|x64.Build.0 = Release|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Release|x86.ActiveCfg = Release|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Release|x86.Build.0 = Release|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Debug|x64.Build.0 = Debug|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Debug|x86.Build.0 = Debug|Any CPU
 		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Release|arm.ActiveCfg = Release|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Release|arm64.ActiveCfg = Release|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Release|x64.ActiveCfg = Release|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Release|x64.Build.0 = Release|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Release|x86.ActiveCfg = Release|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Release|x86.Build.0 = Release|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Debug|x64.Build.0 = Debug|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Debug|x86.Build.0 = Debug|Any CPU
 		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Release|arm.ActiveCfg = Release|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Release|x64.ActiveCfg = Release|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Release|x64.Build.0 = Release|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Release|x86.ActiveCfg = Release|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Release|x86.Build.0 = Release|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Debug|x64.Build.0 = Debug|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Debug|x86.Build.0 = Debug|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Release|arm.ActiveCfg = Release|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Release|x64.ActiveCfg = Release|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Release|x64.Build.0 = Release|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Release|x86.ActiveCfg = Release|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Release|x86.Build.0 = Release|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5CE615CA-7003-4F31-A151-9256239CD41F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Debug|x64.Build.0 = Debug|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Debug|x86.Build.0 = Debug|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Release|arm.ActiveCfg = Release|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Release|arm64.ActiveCfg = Release|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Release|x64.ActiveCfg = Release|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Release|x64.Build.0 = Release|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Release|x86.ActiveCfg = Release|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Release|x86.Build.0 = Release|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Debug|x64.Build.0 = Debug|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Debug|x86.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
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Release|arm.ActiveCfg = Release|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Release|x64.ActiveCfg = Release|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Release|x64.Build.0 = Release|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Release|x86.ActiveCfg = Release|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Release|x86.Build.0 = Release|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Debug|x64.Build.0 = Debug|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Debug|x86.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
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Release|arm.ActiveCfg = Release|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Release|x64.ActiveCfg = Release|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Release|x64.Build.0 = Release|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Release|x86.ActiveCfg = Release|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Release|x86.Build.0 = Release|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Checked|x86.ActiveCfg = Debug|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}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Debug|x64.Build.0 = Debug|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Debug|x86.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
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Release|arm.ActiveCfg = Release|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Release|arm64.ActiveCfg = Release|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Release|x64.ActiveCfg = Release|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Release|x64.Build.0 = Release|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Release|x86.ActiveCfg = Release|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Release|x86.Build.0 = Release|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Debug|x64.Build.0 = Debug|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Debug|x86.Build.0 = Debug|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Release|arm.ActiveCfg = Release|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Release|arm64.ActiveCfg = Release|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Release|x64.ActiveCfg = Release|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Release|x64.Build.0 = Release|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Release|x86.ActiveCfg = Release|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Release|x86.Build.0 = Release|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Debug|x64.Build.0 = Debug|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Debug|x86.Build.0 = Debug|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Release|arm.ActiveCfg = Release|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Release|x64.ActiveCfg = Release|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Release|x64.Build.0 = Release|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Release|x86.ActiveCfg = Release|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Release|x86.Build.0 = Release|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Debug|x64.Build.0 = Debug|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Debug|x86.Build.0 = Debug|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Release|arm.ActiveCfg = Release|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Release|x64.ActiveCfg = Release|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Release|x64.Build.0 = Release|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Release|x86.ActiveCfg = Release|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Release|x86.Build.0 = Release|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Debug|x64.Build.0 = Debug|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Debug|x86.Build.0 = Debug|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Release|arm.ActiveCfg = Release|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Release|x64.ActiveCfg = Release|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Release|x64.Build.0 = Release|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Release|x86.ActiveCfg = Release|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Release|x86.Build.0 = Release|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Debug|x64.Build.0 = Debug|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Debug|x86.Build.0 = Debug|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Release|arm.ActiveCfg = Release|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Release|x64.ActiveCfg = Release|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Release|x64.Build.0 = Release|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Release|x86.ActiveCfg = Release|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Release|x86.Build.0 = Release|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D50B3619-E571-4DCF-99CD-4C8982717C98}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{FBB5EE77-1102-4F26-B849-A24205935920} = {C1F9B6EA-2B79-4304-AB6C-6CB80BEC7F4E}
 		{E51D8981-999E-4516-82BF-5766CE531E53} = {2B702044-D081-480E-877C-6CD7A7BDC726}
 		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC} = {2B702044-D081-480E-877C-6CD7A7BDC726}
-		{CC29474E-0893-4260-8EEF-40375C300736} = {45BD3F1C-C44C-484B-8759-41BFCA7CEFF8}
+		{B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC} = {099F43C3-B397-4871-AA29-0B32869E7B48}
+		{79A37A2A-E133-486E-9DB5-5FA5147184E1} = {099F43C3-B397-4871-AA29-0B32869E7B48}
+		{9A4570D2-9199-47AA-8178-52ECA60C3A08} = {099F43C3-B397-4871-AA29-0B32869E7B48}
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928} = {099F43C3-B397-4871-AA29-0B32869E7B48}
+		{8DF21599-94FF-4B57-8179-67DA3D54D005} = {45BD3F1C-C44C-484B-8759-41BFCA7CEFF8}
 		{BF9DE7F9-08A1-4482-8F81-2895BB99D651} = {45BD3F1C-C44C-484B-8759-41BFCA7CEFF8}
 		{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA} = {45BD3F1C-C44C-484B-8759-41BFCA7CEFF8}
+		{4A8C8CCE-02F6-47E1-A26C-C07778AE8502} = {C881B8F0-59DE-411B-AA11-2729C3273BE2}
+		{5CE615CA-7003-4F31-A151-9256239CD41F} = {C881B8F0-59DE-411B-AA11-2729C3273BE2}
 		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B} = {C881B8F0-59DE-411B-AA11-2729C3273BE2}
-		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928} = {099F43C3-B397-4871-AA29-0B32869E7B48}
+		{0DC8A199-8AE6-4FE8-92F4-153D6521279A} = {B989E5AC-10EA-4BA6-B093-15448876C7BB}
+		{74ECA832-1BC2-4DE9-8CF5-AC8555E11D0E} = {B989E5AC-10EA-4BA6-B093-15448876C7BB}
+		{B989E5AC-10EA-4BA6-B093-15448876C7BB} = {B6F2B9D7-6C55-4EC0-8D1F-A497B4AD4B90}
+		{F48CEAF9-0FF1-4E58-8AD1-06E2E6BB9C70} = {D5E0A88B-0CD6-456C-A9FC-B916D3A0A178}
+		{E21DEB14-DBA3-4BF7-84A1-4C803307C76D} = {D5E0A88B-0CD6-456C-A9FC-B916D3A0A178}
+		{D5E0A88B-0CD6-456C-A9FC-B916D3A0A178} = {B6F2B9D7-6C55-4EC0-8D1F-A497B4AD4B90}
+		{D50B3619-E571-4DCF-99CD-4C8982717C98} = {41782D1F-6C79-437E-AD20-DA5E9D4D274E}
+		{41782D1F-6C79-437E-AD20-DA5E9D4D274E} = {B6F2B9D7-6C55-4EC0-8D1F-A497B4AD4B90}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {26319C28-068C-4C45-9692-D516A03AA6F0}
diff --git a/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln b/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
index 2f67e77485841..496c675186dac 100644
--- a/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
+++ b/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
@@ -25,12 +25,30 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.ReaderWriter", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.ReaderWriter", "src\System.Xml.ReaderWriter.csproj", "{FA7C251C-D1FD-45C3-8CC8-D094F70A03AA}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{6CE30091-2281-4185-8CC8-51C09F73F527}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{F0CCABF6-E529-4CB7-A9E5-8856973F792D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{BFE243B3-BD2B-4738-A1A9-A19EFCD4676B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{FECA55A5-74CE-40F4-8A47-4683EB5090A2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{8025DF35-1D20-4E28-B670-08D4E45CB5DD}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6AA53AA1-786A-4B35-B1C5-9D3B2EC10CF1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{311C66CC-47AC-4965-B704-3C62E57FE29D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{DD1FA45A-B14C-49B5-87C8-1760B478FE91}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{5098D0EF-1661-42AA-A3D2-FB6B0B428742}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{F6928E4C-FEC7-4880-A4CF-32A90E565E23}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{3B9229F8-BF0D-4AF8-A395-4FDF18A76037}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{7B6292AF-F0B0-473F-8054-7FB9DE2F207B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -89,6 +107,26 @@ Global
 		{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
+		{6CE30091-2281-4185-8CC8-51C09F73F527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CE30091-2281-4185-8CC8-51C09F73F527}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6CE30091-2281-4185-8CC8-51C09F73F527}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6CE30091-2281-4185-8CC8-51C09F73F527}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0CCABF6-E529-4CB7-A9E5-8856973F792D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0CCABF6-E529-4CB7-A9E5-8856973F792D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0CCABF6-E529-4CB7-A9E5-8856973F792D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0CCABF6-E529-4CB7-A9E5-8856973F792D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFE243B3-BD2B-4738-A1A9-A19EFCD4676B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFE243B3-BD2B-4738-A1A9-A19EFCD4676B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFE243B3-BD2B-4738-A1A9-A19EFCD4676B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFE243B3-BD2B-4738-A1A9-A19EFCD4676B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FECA55A5-74CE-40F4-8A47-4683EB5090A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FECA55A5-74CE-40F4-8A47-4683EB5090A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FECA55A5-74CE-40F4-8A47-4683EB5090A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FECA55A5-74CE-40F4-8A47-4683EB5090A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8025DF35-1D20-4E28-B670-08D4E45CB5DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8025DF35-1D20-4E28-B670-08D4E45CB5DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8025DF35-1D20-4E28-B670-08D4E45CB5DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8025DF35-1D20-4E28-B670-08D4E45CB5DD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -107,6 +145,14 @@ Global
 		{CA8BC7D5-9A5D-4055-BE69-6D469B38ED02} = {DD1FA45A-B14C-49B5-87C8-1760B478FE91}
 		{640CCB13-BBC5-4B1A-90ED-87DA28BCA4AC} = {DD1FA45A-B14C-49B5-87C8-1760B478FE91}
 		{3CCCB1F8-16A0-46BE-93D9-E11E22294CC1} = {DD1FA45A-B14C-49B5-87C8-1760B478FE91}
+		{6CE30091-2281-4185-8CC8-51C09F73F527} = {5098D0EF-1661-42AA-A3D2-FB6B0B428742}
+		{F0CCABF6-E529-4CB7-A9E5-8856973F792D} = {5098D0EF-1661-42AA-A3D2-FB6B0B428742}
+		{5098D0EF-1661-42AA-A3D2-FB6B0B428742} = {7B6292AF-F0B0-473F-8054-7FB9DE2F207B}
+		{BFE243B3-BD2B-4738-A1A9-A19EFCD4676B} = {F6928E4C-FEC7-4880-A4CF-32A90E565E23}
+		{FECA55A5-74CE-40F4-8A47-4683EB5090A2} = {F6928E4C-FEC7-4880-A4CF-32A90E565E23}
+		{F6928E4C-FEC7-4880-A4CF-32A90E565E23} = {7B6292AF-F0B0-473F-8054-7FB9DE2F207B}
+		{8025DF35-1D20-4E28-B670-08D4E45CB5DD} = {3B9229F8-BF0D-4AF8-A395-4FDF18A76037}
+		{3B9229F8-BF0D-4AF8-A395-4FDF18A76037} = {7B6292AF-F0B0-473F-8054-7FB9DE2F207B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B00449BC-6738-4BD0-A908-5DE1002A348C}
diff --git a/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln b/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln
index f07aed2ed6e11..72a29ca91e10a 100644
--- a/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln
+++ b/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln
@@ -31,12 +31,30 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XDocument", "ref
 EndProject
 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}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{263E03CF-927F-4DAB-A726-5D3730B222D8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{D8F10A21-FBBB-4AB4-B48F-5C3CA876BF6D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{DCB02E2E-49AE-4DA5-B372-E2640E84B570}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{BC80D37C-41FA-48C3-A6D7-91847BD36403}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{318A0B38-9915-426D-93E6-BD096E15C6B9}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8F3CD562-EA5E-4DD1-8B30-E6BA65887115}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AFC9144B-DAD7-470E-B068-C17C24862D23}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{74D73470-4D01-4B7F-A809-D406E7474807}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D5715AF5-BCB4-4A18-8F69-98268D81C670}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{0914FEED-1B6A-4A0B-A792-17E5E445D6D8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{F573D71F-98D3-425B-9E1B-C3189622D167}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{50A22C1D-1D62-4D56-BBB0-CE1BA5CCAD5E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -107,6 +125,26 @@ Global
 		{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
+		{263E03CF-927F-4DAB-A726-5D3730B222D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{263E03CF-927F-4DAB-A726-5D3730B222D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{263E03CF-927F-4DAB-A726-5D3730B222D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{263E03CF-927F-4DAB-A726-5D3730B222D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8F10A21-FBBB-4AB4-B48F-5C3CA876BF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8F10A21-FBBB-4AB4-B48F-5C3CA876BF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8F10A21-FBBB-4AB4-B48F-5C3CA876BF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D8F10A21-FBBB-4AB4-B48F-5C3CA876BF6D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCB02E2E-49AE-4DA5-B372-E2640E84B570}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCB02E2E-49AE-4DA5-B372-E2640E84B570}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCB02E2E-49AE-4DA5-B372-E2640E84B570}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCB02E2E-49AE-4DA5-B372-E2640E84B570}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC80D37C-41FA-48C3-A6D7-91847BD36403}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC80D37C-41FA-48C3-A6D7-91847BD36403}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC80D37C-41FA-48C3-A6D7-91847BD36403}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC80D37C-41FA-48C3-A6D7-91847BD36403}.Release|Any CPU.Build.0 = Release|Any CPU
+		{318A0B38-9915-426D-93E6-BD096E15C6B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{318A0B38-9915-426D-93E6-BD096E15C6B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{318A0B38-9915-426D-93E6-BD096E15C6B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{318A0B38-9915-426D-93E6-BD096E15C6B9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -128,6 +166,14 @@ Global
 		{1168A1A4-299C-4FE3-B0EC-A4F87ACE19B1} = {74D73470-4D01-4B7F-A809-D406E7474807}
 		{AC583FDE-8E90-4EDC-A35E-1E39704E465D} = {74D73470-4D01-4B7F-A809-D406E7474807}
 		{783012DB-85AC-4C81-8310-98FD187A1C53} = {74D73470-4D01-4B7F-A809-D406E7474807}
+		{263E03CF-927F-4DAB-A726-5D3730B222D8} = {D5715AF5-BCB4-4A18-8F69-98268D81C670}
+		{D8F10A21-FBBB-4AB4-B48F-5C3CA876BF6D} = {D5715AF5-BCB4-4A18-8F69-98268D81C670}
+		{D5715AF5-BCB4-4A18-8F69-98268D81C670} = {50A22C1D-1D62-4D56-BBB0-CE1BA5CCAD5E}
+		{DCB02E2E-49AE-4DA5-B372-E2640E84B570} = {0914FEED-1B6A-4A0B-A792-17E5E445D6D8}
+		{BC80D37C-41FA-48C3-A6D7-91847BD36403} = {0914FEED-1B6A-4A0B-A792-17E5E445D6D8}
+		{0914FEED-1B6A-4A0B-A792-17E5E445D6D8} = {50A22C1D-1D62-4D56-BBB0-CE1BA5CCAD5E}
+		{318A0B38-9915-426D-93E6-BD096E15C6B9} = {F573D71F-98D3-425B-9E1B-C3189622D167}
+		{F573D71F-98D3-425B-9E1B-C3189622D167} = {50A22C1D-1D62-4D56-BBB0-CE1BA5CCAD5E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E25A5CFF-8135-4023-9954-63B182032639}
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 8a1f9c4cdd49a..f16b20abc7685 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
@@ -33,12 +33,30 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath.XDocument"
 EndProject
 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}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{1A372455-1140-4FB8-81D2-DDD8DBBD83EF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{132EAF78-CC77-4366-B10F-384818E31D8E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{7B0F9764-CF4C-44B6-B0D3-2C7AD2C60A4E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{B51F1F4C-3166-4EA9-8AF2-9926F3BE4AA0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{4164B210-C08C-42AA-9F15-54EC348318CE}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{47B3DDCB-3A95-4315-9D49-A2653C6F3A17}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7C3C9BDE-3FF9-4B26-BACB-59EB827A5C0C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{21CFCBC2-EE04-43D0-8432-6B4B4DA770F1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{3CEB5CAD-4E84-4587-8BE8-7927AC7242E4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{A55ECA65-20E3-4AC6-8A9F-18B7CA25445C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{84CBFE44-4AE4-4FA7-9162-A0051A9B7A32}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{1BF5C33A-FAD7-4326-8372-A07315BA38AE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -113,6 +131,26 @@ Global
 		{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
+		{1A372455-1140-4FB8-81D2-DDD8DBBD83EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A372455-1140-4FB8-81D2-DDD8DBBD83EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A372455-1140-4FB8-81D2-DDD8DBBD83EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A372455-1140-4FB8-81D2-DDD8DBBD83EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{132EAF78-CC77-4366-B10F-384818E31D8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{132EAF78-CC77-4366-B10F-384818E31D8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{132EAF78-CC77-4366-B10F-384818E31D8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{132EAF78-CC77-4366-B10F-384818E31D8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B0F9764-CF4C-44B6-B0D3-2C7AD2C60A4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B0F9764-CF4C-44B6-B0D3-2C7AD2C60A4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B0F9764-CF4C-44B6-B0D3-2C7AD2C60A4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B0F9764-CF4C-44B6-B0D3-2C7AD2C60A4E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B51F1F4C-3166-4EA9-8AF2-9926F3BE4AA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B51F1F4C-3166-4EA9-8AF2-9926F3BE4AA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B51F1F4C-3166-4EA9-8AF2-9926F3BE4AA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B51F1F4C-3166-4EA9-8AF2-9926F3BE4AA0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4164B210-C08C-42AA-9F15-54EC348318CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4164B210-C08C-42AA-9F15-54EC348318CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4164B210-C08C-42AA-9F15-54EC348318CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4164B210-C08C-42AA-9F15-54EC348318CE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -135,6 +173,14 @@ Global
 		{48DB9946-6D0B-49E4-AB52-59C6CDE636A2} = {21CFCBC2-EE04-43D0-8432-6B4B4DA770F1}
 		{0E9E4E11-BBF5-42B0-AAAF-2C5C2197A4B6} = {21CFCBC2-EE04-43D0-8432-6B4B4DA770F1}
 		{37C6762F-3925-4396-8E19-59173578DB4F} = {21CFCBC2-EE04-43D0-8432-6B4B4DA770F1}
+		{1A372455-1140-4FB8-81D2-DDD8DBBD83EF} = {3CEB5CAD-4E84-4587-8BE8-7927AC7242E4}
+		{132EAF78-CC77-4366-B10F-384818E31D8E} = {3CEB5CAD-4E84-4587-8BE8-7927AC7242E4}
+		{3CEB5CAD-4E84-4587-8BE8-7927AC7242E4} = {1BF5C33A-FAD7-4326-8372-A07315BA38AE}
+		{7B0F9764-CF4C-44B6-B0D3-2C7AD2C60A4E} = {A55ECA65-20E3-4AC6-8A9F-18B7CA25445C}
+		{B51F1F4C-3166-4EA9-8AF2-9926F3BE4AA0} = {A55ECA65-20E3-4AC6-8A9F-18B7CA25445C}
+		{A55ECA65-20E3-4AC6-8A9F-18B7CA25445C} = {1BF5C33A-FAD7-4326-8372-A07315BA38AE}
+		{4164B210-C08C-42AA-9F15-54EC348318CE} = {84CBFE44-4AE4-4FA7-9162-A0051A9B7A32}
+		{84CBFE44-4AE4-4FA7-9162-A0051A9B7A32} = {1BF5C33A-FAD7-4326-8372-A07315BA38AE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AC5CC49B-D68E-4B1E-8C4B-ECBE2F5E3AED}
diff --git a/src/libraries/System.Xml.XPath/System.Xml.XPath.sln b/src/libraries/System.Xml.XPath/System.Xml.XPath.sln
index 0cff10bfcd2ef..9c603f739ff4b 100644
--- a/src/libraries/System.Xml.XPath/System.Xml.XPath.sln
+++ b/src/libraries/System.Xml.XPath/System.Xml.XPath.sln
@@ -27,12 +27,30 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath", "ref\Sys
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath", "src\System.Xml.XPath.csproj", "{F825C114-FF6D-4826-BC8A-586246369695}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{DC22572E-7604-46DF-8AF6-1325793ED015}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{F54C3393-8ADD-4BF7-94F2-7A844FC43901}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{6C6CB8DB-6C4F-4197-9120-97E6F8F3FAD8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{D98A2777-37D4-4DA7-9E1D-3429CEC0CE83}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{860A009C-866F-4B86-B845-1E547083E953}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1EF0B525-2611-41AB-AA69-28A1B9689C3A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{73688A49-11B7-47C8-BF09-A6C1C11EA0BD}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{543F6A8C-B245-464C-A7F5-50D5A1369909}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{2623F3C3-7C12-415B-B22C-CF8D436FCE31}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{0C279DB3-7141-43BA-B380-465BC2A7D3AD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{35CB7823-6ABA-4036-A0C2-172B13A24263}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{ADF3A048-C587-4621-9547-5A7D6A8CC1D8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -95,6 +113,26 @@ Global
 		{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
+		{DC22572E-7604-46DF-8AF6-1325793ED015}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC22572E-7604-46DF-8AF6-1325793ED015}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC22572E-7604-46DF-8AF6-1325793ED015}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC22572E-7604-46DF-8AF6-1325793ED015}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F54C3393-8ADD-4BF7-94F2-7A844FC43901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F54C3393-8ADD-4BF7-94F2-7A844FC43901}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F54C3393-8ADD-4BF7-94F2-7A844FC43901}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F54C3393-8ADD-4BF7-94F2-7A844FC43901}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C6CB8DB-6C4F-4197-9120-97E6F8F3FAD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C6CB8DB-6C4F-4197-9120-97E6F8F3FAD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C6CB8DB-6C4F-4197-9120-97E6F8F3FAD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C6CB8DB-6C4F-4197-9120-97E6F8F3FAD8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D98A2777-37D4-4DA7-9E1D-3429CEC0CE83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D98A2777-37D4-4DA7-9E1D-3429CEC0CE83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D98A2777-37D4-4DA7-9E1D-3429CEC0CE83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D98A2777-37D4-4DA7-9E1D-3429CEC0CE83}.Release|Any CPU.Build.0 = Release|Any CPU
+		{860A009C-866F-4B86-B845-1E547083E953}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{860A009C-866F-4B86-B845-1E547083E953}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{860A009C-866F-4B86-B845-1E547083E953}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{860A009C-866F-4B86-B845-1E547083E953}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -114,6 +152,14 @@ Global
 		{E0AD66A8-D552-43C6-AB0F-305A2CD2A628} = {543F6A8C-B245-464C-A7F5-50D5A1369909}
 		{F02C927A-92DA-4212-A228-EE4E82317723} = {543F6A8C-B245-464C-A7F5-50D5A1369909}
 		{2E9AD1A2-506F-469A-AAB9-C6BA43FC78E1} = {543F6A8C-B245-464C-A7F5-50D5A1369909}
+		{DC22572E-7604-46DF-8AF6-1325793ED015} = {2623F3C3-7C12-415B-B22C-CF8D436FCE31}
+		{F54C3393-8ADD-4BF7-94F2-7A844FC43901} = {2623F3C3-7C12-415B-B22C-CF8D436FCE31}
+		{2623F3C3-7C12-415B-B22C-CF8D436FCE31} = {ADF3A048-C587-4621-9547-5A7D6A8CC1D8}
+		{6C6CB8DB-6C4F-4197-9120-97E6F8F3FAD8} = {0C279DB3-7141-43BA-B380-465BC2A7D3AD}
+		{D98A2777-37D4-4DA7-9E1D-3429CEC0CE83} = {0C279DB3-7141-43BA-B380-465BC2A7D3AD}
+		{0C279DB3-7141-43BA-B380-465BC2A7D3AD} = {ADF3A048-C587-4621-9547-5A7D6A8CC1D8}
+		{860A009C-866F-4B86-B845-1E547083E953} = {35CB7823-6ABA-4036-A0C2-172B13A24263}
+		{35CB7823-6ABA-4036-A0C2-172B13A24263} = {ADF3A048-C587-4621-9547-5A7D6A8CC1D8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DF8F269A-6F5E-4DE2-A0D7-6852F6470D4C}
diff --git a/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln b/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
index 97dca6f899460..20d2dc85307db 100644
--- a/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
+++ b/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
@@ -35,12 +35,30 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSerializer",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSerializer", "src\System.Xml.XmlSerializer.csproj", "{67D79968-DF22-4273-B2FA-D3EEC905095C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.CodeFixProvider", "..\..\tools\illink\src\ILLink.CodeFix\ILLink.CodeFixProvider.csproj", "{69E14AF2-7A37-4AF7-9D1D-2A1AF0380310}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.RoslynAnalyzer", "..\..\tools\illink\src\ILLink.RoslynAnalyzer\ILLink.RoslynAnalyzer.csproj", "{255C23A7-E30C-4434-8505-DCC12D677219}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "..\..\tools\illink\src\ILLink.Tasks\ILLink.Tasks.csproj", "{2927D846-7CC6-45D6-BC2E-7CFFADC199EC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\Mono.Linker.csproj", "{48068FE4-A518-4FFE-BC3B-CCB32CEB8F9A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{472C1DA7-6CDB-43DE-A531-D7E4C37EE4D9}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E0C34B2E-D8CC-4A13-9635-3FD9AF37EC9B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F0B2F254-B3E6-4BAA-8C92-2373990CF48B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{8B996FD2-F7BF-4196-9468-998117E8C7C1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{9C7B7197-1F5F-45BB-B650-AB2F98DFFAEE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{20566498-BF1A-418D-B957-45309C2B863F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{44463803-C221-4663-BFCA-F91D8A8750ED}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{C8100D34-EC4F-4759-AA80-3A19FB203993}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -119,6 +137,26 @@ Global
 		{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
+		{69E14AF2-7A37-4AF7-9D1D-2A1AF0380310}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69E14AF2-7A37-4AF7-9D1D-2A1AF0380310}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69E14AF2-7A37-4AF7-9D1D-2A1AF0380310}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69E14AF2-7A37-4AF7-9D1D-2A1AF0380310}.Release|Any CPU.Build.0 = Release|Any CPU
+		{255C23A7-E30C-4434-8505-DCC12D677219}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{255C23A7-E30C-4434-8505-DCC12D677219}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{255C23A7-E30C-4434-8505-DCC12D677219}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{255C23A7-E30C-4434-8505-DCC12D677219}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2927D846-7CC6-45D6-BC2E-7CFFADC199EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2927D846-7CC6-45D6-BC2E-7CFFADC199EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2927D846-7CC6-45D6-BC2E-7CFFADC199EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2927D846-7CC6-45D6-BC2E-7CFFADC199EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{48068FE4-A518-4FFE-BC3B-CCB32CEB8F9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48068FE4-A518-4FFE-BC3B-CCB32CEB8F9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48068FE4-A518-4FFE-BC3B-CCB32CEB8F9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{48068FE4-A518-4FFE-BC3B-CCB32CEB8F9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{472C1DA7-6CDB-43DE-A531-D7E4C37EE4D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{472C1DA7-6CDB-43DE-A531-D7E4C37EE4D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{472C1DA7-6CDB-43DE-A531-D7E4C37EE4D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{472C1DA7-6CDB-43DE-A531-D7E4C37EE4D9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -142,6 +180,14 @@ Global
 		{3232286F-6DB1-46A6-AA45-CA9014FD8D9A} = {8B996FD2-F7BF-4196-9468-998117E8C7C1}
 		{91E43C52-718D-46CE-B832-230A3730A32F} = {8B996FD2-F7BF-4196-9468-998117E8C7C1}
 		{F3678706-5923-4F5E-B33C-625C22A9CA32} = {8B996FD2-F7BF-4196-9468-998117E8C7C1}
+		{69E14AF2-7A37-4AF7-9D1D-2A1AF0380310} = {9C7B7197-1F5F-45BB-B650-AB2F98DFFAEE}
+		{255C23A7-E30C-4434-8505-DCC12D677219} = {9C7B7197-1F5F-45BB-B650-AB2F98DFFAEE}
+		{9C7B7197-1F5F-45BB-B650-AB2F98DFFAEE} = {C8100D34-EC4F-4759-AA80-3A19FB203993}
+		{2927D846-7CC6-45D6-BC2E-7CFFADC199EC} = {20566498-BF1A-418D-B957-45309C2B863F}
+		{48068FE4-A518-4FFE-BC3B-CCB32CEB8F9A} = {20566498-BF1A-418D-B957-45309C2B863F}
+		{20566498-BF1A-418D-B957-45309C2B863F} = {C8100D34-EC4F-4759-AA80-3A19FB203993}
+		{472C1DA7-6CDB-43DE-A531-D7E4C37EE4D9} = {44463803-C221-4663-BFCA-F91D8A8750ED}
+		{44463803-C221-4663-BFCA-F91D8A8750ED} = {C8100D34-EC4F-4759-AA80-3A19FB203993}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {24AD78FE-B27D-46DE-B574-17F4CC6DF7CC}
diff --git a/src/tools/Directory.Build.props b/src/tools/Directory.Build.props
index d654a5047c208..984715d7390e6 100644
--- a/src/tools/Directory.Build.props
+++ b/src/tools/Directory.Build.props
@@ -3,7 +3,7 @@
   <Import Project="..\..\Directory.Build.props" />
 
   <PropertyGroup>
-    <SlnGenSolutionFolder>tools</SlnGenSolutionFolder>
+    <SlnGenSolutionFolder>tools\</SlnGenSolutionFolder>
   </PropertyGroup>
 
 </Project>
\ No newline at end of file