From 707810296171927968c046ab3287db376e17e200 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 30 Nov 2018 15:13:05 -0800
Subject: [PATCH] Update targets and projects to build Localization projects

---
 .gitmodules                       |   4 -
 build/artifacts.props             |   2 -
 build/buildorder.props            |   1 -
 build/dependencies.props          |   2 +
 build/external-dependencies.props |   2 +
 build/submodules.props            |   1 -
 eng/Baseline.Designer.props       |  18 ++++
 eng/Baseline.xml                  |   2 +
 eng/Dependencies.props            |   2 +
 eng/ProjectReferences.props       |   2 +
 eng/dependencies.temp.props       |   1 +
 modules/Localization              |   1 -
 src/Middleware/Middleware.sln     | 145 ++++++++++++++++++++++++++++++
 13 files changed, 174 insertions(+), 9 deletions(-)
 delete mode 160000 modules/Localization

diff --git a/.gitmodules b/.gitmodules
index 6526061429..38efb95128 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,10 +6,6 @@
 	path = modules/Identity
 	url = https://github.com/aspnet/Identity.git
 	branch = release/2.1
-[submodule "modules/Localization"]
-	path = modules/Localization
-	url = https://github.com/aspnet/Localization.git
-	branch = release/2.1
 [submodule "modules/Scaffolding"]
 	path = modules/Scaffolding
 	url = https://github.com/aspnet/Scaffolding.git
diff --git a/build/artifacts.props b/build/artifacts.props
index 63d8d11c9b..65cd508d4b 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -178,8 +178,6 @@
     <PackageArtifact Include="Microsoft.Extensions.ApplicationModelDetection" Category="noship" />
     <PackageArtifact Include="Microsoft.Extensions.Identity.Core" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Identity.Stores" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Localization.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Localization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.Net.Http.Headers" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.NET.Sdk.Razor" Category="ship" />
     <PackageArtifact Include="Microsoft.Owin.Security.Interop" Category="ship" />
diff --git a/build/buildorder.props b/build/buildorder.props
index 799bbea1c6..8976913413 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -18,7 +18,6 @@
     <RepositoryBuildOrder Include="ResponseCaching" Order="11" RootPath="$(RepositoryRoot)src\ResponseCaching\" />
     <RepositoryBuildOrder Include="Session" Order="11" RootPath="$(RepositoryRoot)src\Session\" />
     <RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
-    <RepositoryBuildOrder Include="Localization" Order="12" />
     <RepositoryBuildOrder Include="Security" Order="13" RootPath="$(RepositoryRoot)src\Security\" />
     <RepositoryBuildOrder Include="MetaPackages" Order="13" RootPath="$(RepositoryRoot)src\MetaPackages\" />
     <RepositoryBuildOrder Include="Mvc" Order="14" RootPath="$(RepositoryRoot)src\Mvc\" />
diff --git a/build/dependencies.props b/build/dependencies.props
index f4f0d4a75f..1c6eb173a4 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -61,6 +61,8 @@
     <MicrosoftExtensionsHostingAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsHostingAbstractionsPackageVersion>
     <MicrosoftExtensionsHostingPackageVersion>2.1.1</MicrosoftExtensionsHostingPackageVersion>
     <MicrosoftExtensionsHttpPackageVersion>2.1.1</MicrosoftExtensionsHttpPackageVersion>
+    <MicrosoftExtensionsLocalizationAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsLocalizationAbstractionsPackageVersion>
+    <MicrosoftExtensionsLocalizationPackageVersion>2.1.1</MicrosoftExtensionsLocalizationPackageVersion>
     <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
     <MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>2.1.1</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
     <MicrosoftExtensionsLoggingConfigurationPackageVersion>2.1.1</MicrosoftExtensionsLoggingConfigurationPackageVersion>
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index 70d6935c05..3211909c6e 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -59,6 +59,8 @@
     <ExtensionsDependency Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)"  AllMetapackage="true" AppMetapackage="true" />
     <ExtensionsDependency Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
     <ExtensionsDependency Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsHostingAbstractionsPackageVersion)" AllMetapackage="true" AppMetapackage="true" />
+    <ExtensionsDependency Include="Microsoft.Extensions.Localization.Abstractions" Version="$(MicrosoftExtensionsLocalizationAbstractionsPackageVersion)" AllMetapackage="true" AppMetapackage="true" />
+    <ExtensionsDependency Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" AllMetapackage="true" AppMetapackage="true" />
     <ExtensionsDependency Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingPackageVersion)" AllMetapackage="true" AppMetapackage="true" />
     <ExtensionsDependency Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpPackageVersion)" AllMetapackage="true" AppMetapackage="true" />
     <ExtensionsDependency Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)"  AllMetapackage="true" AppMetapackage="true" />
diff --git a/build/submodules.props b/build/submodules.props
index f473c4b63a..1a035581ee 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -57,7 +57,6 @@
     <ShippedRepository Include="Identity" />
     <ShippedRepository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
     <ShippedRepository Include="JsonPatch" />
-    <ShippedRepository Include="Localization" />
     <ShippedRepository Include="Mvc" RootPath="$(RepositoryRoot)src\Mvc\" />
     <ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
     <ShippedRepository Include="Razor" RootPath="$(RepositoryRoot)src\Razor\" />
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index a5779d6cef..7935aed56a 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -282,6 +282,24 @@
     <BaselinePackageReference Include="Microsoft.CSharp" Version="[4.5.0, )" />
     <BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Localization.Routing-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Localization.Routing' ">
+    <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Localization.Routing' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Localization" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="[2.1.1, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Localization-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Localization' ">
+    <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Localization' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
+  </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.MiddlewareAnalysis-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.MiddlewareAnalysis' ">
     <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 584a0b82b2..a85c9189ce 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -31,6 +31,8 @@
   <Package Id="Microsoft.AspNetCore.HttpOverrides" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.HttpsPolicy" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.JsonPatch" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.Localization.Routing" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.Localization" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Owin" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index c90d06dd27..0d3c00dfee 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -27,6 +27,8 @@
     <LatestPackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="$(MicrosoftExtensionsDiagnosticAdapterPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(MicrosoftExtensionsLocalizationAbstractionsPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
index 90805872f6..c3409a2243 100644
--- a/eng/ProjectReferences.props
+++ b/eng/ProjectReferences.props
@@ -45,6 +45,8 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.HostFiltering" ProjectPath="$(RepositoryRoot)src\Middleware\HostFiltering\src\Microsoft.AspNetCore.HostFiltering.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.HttpOverrides" ProjectPath="$(RepositoryRoot)src\Middleware\HttpOverrides\src\Microsoft.AspNetCore.HttpOverrides.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.HttpsPolicy" ProjectPath="$(RepositoryRoot)src\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Localization.Routing" ProjectPath="$(RepositoryRoot)src\Middleware\Localization.Routing\src\Microsoft.AspNetCore.Localization.Routing.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Localization" ProjectPath="$(RepositoryRoot)src\Middleware\Localization\src\Microsoft.AspNetCore.Localization.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.MiddlewareAnalysis" ProjectPath="$(RepositoryRoot)src\Middleware\MiddlewareAnalysis\src\Microsoft.AspNetCore.MiddlewareAnalysis.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCompression" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCompression\src\Microsoft.AspNetCore.ResponseCompression.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Rewrite" ProjectPath="$(RepositoryRoot)src\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj" />
diff --git a/eng/dependencies.temp.props b/eng/dependencies.temp.props
index e1cf0cae8a..0c9dbc1f37 100644
--- a/eng/dependencies.temp.props
+++ b/eng/dependencies.temp.props
@@ -6,5 +6,6 @@ This is required to provide dependencies for samples and tests.
   <ItemGroup>
     <LatestPackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.1" />
     <LatestPackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
+    <LatestPackageReference Include="Microsoft.AspNetCore.Routing" Version="2.1.1" />
   </ItemGroup>
 </Project>
diff --git a/modules/Localization b/modules/Localization
deleted file mode 160000
index 0bcac31dd7..0000000000
--- a/modules/Localization
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0bcac31dd705fb9db60723f5d7eaeffb728358f5
diff --git a/src/Middleware/Middleware.sln b/src/Middleware/Middleware.sln
index ffb9489843..ff339c9688 100644
--- a/src/Middleware/Middleware.sln
+++ b/src/Middleware/Middleware.sln
@@ -107,6 +107,32 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Rewrit
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Rewrite.Tests", "Rewrite\test\Microsoft.AspNetCore.Rewrite.Tests.csproj", "{11F435FE-0264-4465-A208-885ECBFADABF}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Localization", "Localization", "{17871C77-BFDD-4728-B3FD-BA17B01D1D5F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocalizationSample", "Localization\sample\LocalizationSample.csproj", "{2448BF25-39D5-43A0-8FED-E25ECE8ED1C6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Localization", "Localization\src\Microsoft.AspNetCore.Localization.csproj", "{01647DD9-C1BD-479F-8507-8E219EDBA899}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{10E7800C-A3E3-4A9C-9F3A-3095D23FFD58}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Localization.FunctionalTests", "Localization\test\FunctionalTests\Microsoft.AspNetCore.Localization.FunctionalTests.csproj", "{96ECFAFA-1119-4301-81F6-66CBE0BD4C2E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Localization.Tests", "Localization\test\UnitTests\Microsoft.AspNetCore.Localization.Tests.csproj", "{63A76741-BFDA-447A-ACA9-F7A4AA5D26DD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{38B6D9DD-F868-4B97-A258-A07A46CDF2F2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocalizationWebsite", "Localization\testassets\LocalizationWebsite\LocalizationWebsite.csproj", "{EC572E03-740A-4259-A2DD-2A68AFA3C080}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourcesClassLibraryNoAttribute", "Localization\testassets\ResourcesClassLibraryNoAttribute\ResourcesClassLibraryNoAttribute.csproj", "{157B4019-EE10-4EC2-BA0D-933D513C673E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourcesClassLibraryWithAttribute", "Localization\testassets\ResourcesClassLibraryWithAttribute\ResourcesClassLibraryWithAttribute.csproj", "{EEFA1A6F-3B7E-4A40-AF2A-EA2DBFC09501}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Localization.Routing", "Localization.Routing", "{650A4392-A1A3-495B-8AB9-3361CFB6A7C1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Localization.Routing", "Localization.Routing\src\Microsoft.AspNetCore.Localization.Routing.csproj", "{826E46DB-2801-450B-9B3F-D4CB473579E2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Localization.Routing.Tests", "Localization.Routing\test\Microsoft.AspNetCore.Localization.Routing.Tests.csproj", "{0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -561,6 +587,114 @@ Global
 		{11F435FE-0264-4465-A208-885ECBFADABF}.Release|x64.Build.0 = Release|Any CPU
 		{11F435FE-0264-4465-A208-885ECBFADABF}.Release|x86.ActiveCfg = Release|Any CPU
 		{11F435FE-0264-4465-A208-885ECBFADABF}.Release|x86.Build.0 = Release|Any CPU
+		{2448BF25-39D5-43A0-8FED-E25ECE8ED1C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2448BF25-39D5-43A0-8FED-E25ECE8ED1C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2448BF25-39D5-43A0-8FED-E25ECE8ED1C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2448BF25-39D5-43A0-8FED-E25ECE8ED1C6}.Debug|x64.Build.0 = Debug|Any CPU
+		{2448BF25-39D5-43A0-8FED-E25ECE8ED1C6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2448BF25-39D5-43A0-8FED-E25ECE8ED1C6}.Debug|x86.Build.0 = Debug|Any CPU
+		{2448BF25-39D5-43A0-8FED-E25ECE8ED1C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2448BF25-39D5-43A0-8FED-E25ECE8ED1C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2448BF25-39D5-43A0-8FED-E25ECE8ED1C6}.Release|x64.ActiveCfg = Release|Any CPU
+		{2448BF25-39D5-43A0-8FED-E25ECE8ED1C6}.Release|x64.Build.0 = Release|Any CPU
+		{2448BF25-39D5-43A0-8FED-E25ECE8ED1C6}.Release|x86.ActiveCfg = Release|Any CPU
+		{2448BF25-39D5-43A0-8FED-E25ECE8ED1C6}.Release|x86.Build.0 = Release|Any CPU
+		{01647DD9-C1BD-479F-8507-8E219EDBA899}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01647DD9-C1BD-479F-8507-8E219EDBA899}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01647DD9-C1BD-479F-8507-8E219EDBA899}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{01647DD9-C1BD-479F-8507-8E219EDBA899}.Debug|x64.Build.0 = Debug|Any CPU
+		{01647DD9-C1BD-479F-8507-8E219EDBA899}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{01647DD9-C1BD-479F-8507-8E219EDBA899}.Debug|x86.Build.0 = Debug|Any CPU
+		{01647DD9-C1BD-479F-8507-8E219EDBA899}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01647DD9-C1BD-479F-8507-8E219EDBA899}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01647DD9-C1BD-479F-8507-8E219EDBA899}.Release|x64.ActiveCfg = Release|Any CPU
+		{01647DD9-C1BD-479F-8507-8E219EDBA899}.Release|x64.Build.0 = Release|Any CPU
+		{01647DD9-C1BD-479F-8507-8E219EDBA899}.Release|x86.ActiveCfg = Release|Any CPU
+		{01647DD9-C1BD-479F-8507-8E219EDBA899}.Release|x86.Build.0 = Release|Any CPU
+		{96ECFAFA-1119-4301-81F6-66CBE0BD4C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96ECFAFA-1119-4301-81F6-66CBE0BD4C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96ECFAFA-1119-4301-81F6-66CBE0BD4C2E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{96ECFAFA-1119-4301-81F6-66CBE0BD4C2E}.Debug|x64.Build.0 = Debug|Any CPU
+		{96ECFAFA-1119-4301-81F6-66CBE0BD4C2E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{96ECFAFA-1119-4301-81F6-66CBE0BD4C2E}.Debug|x86.Build.0 = Debug|Any CPU
+		{96ECFAFA-1119-4301-81F6-66CBE0BD4C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96ECFAFA-1119-4301-81F6-66CBE0BD4C2E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96ECFAFA-1119-4301-81F6-66CBE0BD4C2E}.Release|x64.ActiveCfg = Release|Any CPU
+		{96ECFAFA-1119-4301-81F6-66CBE0BD4C2E}.Release|x64.Build.0 = Release|Any CPU
+		{96ECFAFA-1119-4301-81F6-66CBE0BD4C2E}.Release|x86.ActiveCfg = Release|Any CPU
+		{96ECFAFA-1119-4301-81F6-66CBE0BD4C2E}.Release|x86.Build.0 = Release|Any CPU
+		{63A76741-BFDA-447A-ACA9-F7A4AA5D26DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63A76741-BFDA-447A-ACA9-F7A4AA5D26DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63A76741-BFDA-447A-ACA9-F7A4AA5D26DD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{63A76741-BFDA-447A-ACA9-F7A4AA5D26DD}.Debug|x64.Build.0 = Debug|Any CPU
+		{63A76741-BFDA-447A-ACA9-F7A4AA5D26DD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{63A76741-BFDA-447A-ACA9-F7A4AA5D26DD}.Debug|x86.Build.0 = Debug|Any CPU
+		{63A76741-BFDA-447A-ACA9-F7A4AA5D26DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63A76741-BFDA-447A-ACA9-F7A4AA5D26DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63A76741-BFDA-447A-ACA9-F7A4AA5D26DD}.Release|x64.ActiveCfg = Release|Any CPU
+		{63A76741-BFDA-447A-ACA9-F7A4AA5D26DD}.Release|x64.Build.0 = Release|Any CPU
+		{63A76741-BFDA-447A-ACA9-F7A4AA5D26DD}.Release|x86.ActiveCfg = Release|Any CPU
+		{63A76741-BFDA-447A-ACA9-F7A4AA5D26DD}.Release|x86.Build.0 = Release|Any CPU
+		{EC572E03-740A-4259-A2DD-2A68AFA3C080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC572E03-740A-4259-A2DD-2A68AFA3C080}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC572E03-740A-4259-A2DD-2A68AFA3C080}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EC572E03-740A-4259-A2DD-2A68AFA3C080}.Debug|x64.Build.0 = Debug|Any CPU
+		{EC572E03-740A-4259-A2DD-2A68AFA3C080}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EC572E03-740A-4259-A2DD-2A68AFA3C080}.Debug|x86.Build.0 = Debug|Any CPU
+		{EC572E03-740A-4259-A2DD-2A68AFA3C080}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC572E03-740A-4259-A2DD-2A68AFA3C080}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC572E03-740A-4259-A2DD-2A68AFA3C080}.Release|x64.ActiveCfg = Release|Any CPU
+		{EC572E03-740A-4259-A2DD-2A68AFA3C080}.Release|x64.Build.0 = Release|Any CPU
+		{EC572E03-740A-4259-A2DD-2A68AFA3C080}.Release|x86.ActiveCfg = Release|Any CPU
+		{EC572E03-740A-4259-A2DD-2A68AFA3C080}.Release|x86.Build.0 = Release|Any CPU
+		{157B4019-EE10-4EC2-BA0D-933D513C673E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{157B4019-EE10-4EC2-BA0D-933D513C673E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{157B4019-EE10-4EC2-BA0D-933D513C673E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{157B4019-EE10-4EC2-BA0D-933D513C673E}.Debug|x64.Build.0 = Debug|Any CPU
+		{157B4019-EE10-4EC2-BA0D-933D513C673E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{157B4019-EE10-4EC2-BA0D-933D513C673E}.Debug|x86.Build.0 = Debug|Any CPU
+		{157B4019-EE10-4EC2-BA0D-933D513C673E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{157B4019-EE10-4EC2-BA0D-933D513C673E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{157B4019-EE10-4EC2-BA0D-933D513C673E}.Release|x64.ActiveCfg = Release|Any CPU
+		{157B4019-EE10-4EC2-BA0D-933D513C673E}.Release|x64.Build.0 = Release|Any CPU
+		{157B4019-EE10-4EC2-BA0D-933D513C673E}.Release|x86.ActiveCfg = Release|Any CPU
+		{157B4019-EE10-4EC2-BA0D-933D513C673E}.Release|x86.Build.0 = Release|Any CPU
+		{EEFA1A6F-3B7E-4A40-AF2A-EA2DBFC09501}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEFA1A6F-3B7E-4A40-AF2A-EA2DBFC09501}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEFA1A6F-3B7E-4A40-AF2A-EA2DBFC09501}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EEFA1A6F-3B7E-4A40-AF2A-EA2DBFC09501}.Debug|x64.Build.0 = Debug|Any CPU
+		{EEFA1A6F-3B7E-4A40-AF2A-EA2DBFC09501}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EEFA1A6F-3B7E-4A40-AF2A-EA2DBFC09501}.Debug|x86.Build.0 = Debug|Any CPU
+		{EEFA1A6F-3B7E-4A40-AF2A-EA2DBFC09501}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEFA1A6F-3B7E-4A40-AF2A-EA2DBFC09501}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEFA1A6F-3B7E-4A40-AF2A-EA2DBFC09501}.Release|x64.ActiveCfg = Release|Any CPU
+		{EEFA1A6F-3B7E-4A40-AF2A-EA2DBFC09501}.Release|x64.Build.0 = Release|Any CPU
+		{EEFA1A6F-3B7E-4A40-AF2A-EA2DBFC09501}.Release|x86.ActiveCfg = Release|Any CPU
+		{EEFA1A6F-3B7E-4A40-AF2A-EA2DBFC09501}.Release|x86.Build.0 = Release|Any CPU
+		{826E46DB-2801-450B-9B3F-D4CB473579E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{826E46DB-2801-450B-9B3F-D4CB473579E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{826E46DB-2801-450B-9B3F-D4CB473579E2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{826E46DB-2801-450B-9B3F-D4CB473579E2}.Debug|x64.Build.0 = Debug|Any CPU
+		{826E46DB-2801-450B-9B3F-D4CB473579E2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{826E46DB-2801-450B-9B3F-D4CB473579E2}.Debug|x86.Build.0 = Debug|Any CPU
+		{826E46DB-2801-450B-9B3F-D4CB473579E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{826E46DB-2801-450B-9B3F-D4CB473579E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{826E46DB-2801-450B-9B3F-D4CB473579E2}.Release|x64.ActiveCfg = Release|Any CPU
+		{826E46DB-2801-450B-9B3F-D4CB473579E2}.Release|x64.Build.0 = Release|Any CPU
+		{826E46DB-2801-450B-9B3F-D4CB473579E2}.Release|x86.ActiveCfg = Release|Any CPU
+		{826E46DB-2801-450B-9B3F-D4CB473579E2}.Release|x86.Build.0 = Release|Any CPU
+		{0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779}.Debug|x64.Build.0 = Debug|Any CPU
+		{0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779}.Debug|x86.Build.0 = Debug|Any CPU
+		{0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779}.Release|x64.ActiveCfg = Release|Any CPU
+		{0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779}.Release|x64.Build.0 = Release|Any CPU
+		{0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779}.Release|x86.ActiveCfg = Release|Any CPU
+		{0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -608,6 +742,17 @@ Global
 		{B41776DE-6CB6-4B99-BBB5-323DF16BE07D} = {4150EBDB-57AB-4C69-A4F1-068152F4EFF5}
 		{37E12A04-E80E-4C8C-A9EA-2C44AD340884} = {4150EBDB-57AB-4C69-A4F1-068152F4EFF5}
 		{11F435FE-0264-4465-A208-885ECBFADABF} = {4150EBDB-57AB-4C69-A4F1-068152F4EFF5}
+		{2448BF25-39D5-43A0-8FED-E25ECE8ED1C6} = {17871C77-BFDD-4728-B3FD-BA17B01D1D5F}
+		{01647DD9-C1BD-479F-8507-8E219EDBA899} = {17871C77-BFDD-4728-B3FD-BA17B01D1D5F}
+		{10E7800C-A3E3-4A9C-9F3A-3095D23FFD58} = {17871C77-BFDD-4728-B3FD-BA17B01D1D5F}
+		{96ECFAFA-1119-4301-81F6-66CBE0BD4C2E} = {10E7800C-A3E3-4A9C-9F3A-3095D23FFD58}
+		{63A76741-BFDA-447A-ACA9-F7A4AA5D26DD} = {10E7800C-A3E3-4A9C-9F3A-3095D23FFD58}
+		{38B6D9DD-F868-4B97-A258-A07A46CDF2F2} = {17871C77-BFDD-4728-B3FD-BA17B01D1D5F}
+		{EC572E03-740A-4259-A2DD-2A68AFA3C080} = {38B6D9DD-F868-4B97-A258-A07A46CDF2F2}
+		{157B4019-EE10-4EC2-BA0D-933D513C673E} = {38B6D9DD-F868-4B97-A258-A07A46CDF2F2}
+		{EEFA1A6F-3B7E-4A40-AF2A-EA2DBFC09501} = {38B6D9DD-F868-4B97-A258-A07A46CDF2F2}
+		{826E46DB-2801-450B-9B3F-D4CB473579E2} = {650A4392-A1A3-495B-8AB9-3361CFB6A7C1}
+		{0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779} = {650A4392-A1A3-495B-8AB9-3361CFB6A7C1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {83786312-A93B-4BB4-AB06-7C6913A59AFA}