From 67c3a099ec1d8e0c882ca357f2ab25f52a2a6145 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Tue, 6 Nov 2018 12:04:36 -0800
Subject: [PATCH] Remove the aspnet/Configuration submodule (#3948)

---
 .gitmodules                       |  4 ----
 build/CodeSign.props              | 27 ++++++++++++++++++++-------
 build/artifacts.props             | 12 ------------
 build/buildorder.props            |  1 -
 build/dependencies.props          | 12 ++++++++++++
 build/external-dependencies.props | 12 ++++++++++++
 build/repo.targets                |  1 +
 build/submodules.props            |  1 -
 modules/Configuration             |  1 -
 9 files changed, 45 insertions(+), 26 deletions(-)
 delete mode 160000 modules/Configuration

diff --git a/.gitmodules b/.gitmodules
index 69ad207d6c..4ac3c4e48b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,10 +26,6 @@
 	path = modules/Caching
 	url = https://github.com/aspnet/Caching.git
 	branch = release/2.2
-[submodule "modules/Configuration"]
-	path = modules/Configuration
-	url = https://github.com/aspnet/Configuration.git
-	branch = release/2.2
 [submodule "modules/CORS"]
 	path = modules/CORS
 	url = https://github.com/aspnet/CORS.git
diff --git a/build/CodeSign.props b/build/CodeSign.props
index c4e9397c63..46c74c6137 100644
--- a/build/CodeSign.props
+++ b/build/CodeSign.props
@@ -18,16 +18,29 @@
       <FilesToSign Include="System.Interactive.Async.dll"                                  Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.App" />
 
     <!-- These files came from the aspnet/Extensions build, but have to be re-signed because we crossgen them. -->
-      <FilesToSign Include="Microsoft.Extensions.DependencyInjection.dll"                   Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Configuration.AzureKeyVault.dll"           Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+
+      <FilesToSign Include="Microsoft.Extensions.Configuration.Abstractions.dll"            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Configuration.Binder.dll"                  Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Configuration.CommandLine.dll"             Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Configuration.dll"                         Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Configuration.EnvironmentVariables.dll"    Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Configuration.FileExtensions.dll"          Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Configuration.Ini.dll"                     Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Configuration.Json.dll"                    Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Configuration.KeyPerFile.dll"              Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Configuration.UserSecrets.dll"             Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Configuration.Xml.dll"                     Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
       <FilesToSign Include="Microsoft.Extensions.DependencyInjection.Abstractions.dll"      Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.DependencyInjection.dll"                   Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
       <FilesToSign Include="Microsoft.Extensions.DiagnosticAdapter.dll"                     Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.FileProviders.Abstractions.dll"            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.FileProviders.Composite.dll"               Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.FileProviders.Embedded.dll"                Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.FileProviders.Physical.dll"                Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.FileSystemGlobbing.dll"                    Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
       <FilesToSign Include="Microsoft.Extensions.ObjectPool.dll"                            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
-      <FilesToSign Include="Microsoft.Extensions.Primitives.dll"                            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App"  />
-      <FilesToSign Include="Microsoft.Extensions.FileProviders.Abstractions.dll"            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App"  />
-      <FilesToSign Include="Microsoft.Extensions.FileProviders.Composite.dll"               Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App"  />
-      <FilesToSign Include="Microsoft.Extensions.FileProviders.Embedded.dll"                Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App"  />
-      <FilesToSign Include="Microsoft.Extensions.FileProviders.Physical.dll"                Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App"  />
-      <FilesToSign Include="Microsoft.Extensions.FileSystemGlobbing.dll"                    Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App"  />
+      <FilesToSign Include="Microsoft.Extensions.Primitives.dll"                            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
 
     <!-- These files came from partner teams. They have to be re-signed because we crossgen them and redistributable them in our installers. -->
 
diff --git a/build/artifacts.props b/build/artifacts.props
index 50e4495127..7ed1e58869 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -193,18 +193,6 @@
     <PackageArtifact Include="Microsoft.Extensions.Caching.Redis" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Caching.StackExchangeRedis" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Caching.SqlServer" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Configuration.Abstractions" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Configuration.AzureKeyVault" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Configuration.Binder" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Configuration.CommandLine" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Configuration.FileExtensions" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Configuration.Ini" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Configuration.Json" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Configuration.KeyPerFile" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Configuration.UserSecrets" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Configuration.Xml" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.Configuration" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks" Category="ship"  />
diff --git a/build/buildorder.props b/build/buildorder.props
index 118588c917..4ab4cdd087 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <RepositoryBuildOrder Include="JsonPatch" Order="2" />
-    <RepositoryBuildOrder Include="Configuration" Order="3" />
     <RepositoryBuildOrder Include="Options" Order="4" />
     <RepositoryBuildOrder Include="DotNetTools" Order="4" />
     <RepositoryBuildOrder Include="Caching" Order="5" />
diff --git a/build/dependencies.props b/build/dependencies.props
index 3f4590ce29..cd0ea7d543 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -14,6 +14,18 @@
     <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
     <MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>
     <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>2.2.0-rtm-35646</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
+    <MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>2.2.0-rtm-35646</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
+    <MicrosoftExtensionsConfigurationBinderPackageVersion>2.2.0-rtm-35646</MicrosoftExtensionsConfigurationBinderPackageVersion>
+    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.2.0-rtm-35646</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>2.2.0-rtm-35646</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
+    <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>2.2.0-rtm-35646</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
+    <MicrosoftExtensionsConfigurationIniPackageVersion>2.2.0-rtm-35646</MicrosoftExtensionsConfigurationIniPackageVersion>
+    <MicrosoftExtensionsConfigurationJsonPackageVersion>2.2.0-rtm-35646</MicrosoftExtensionsConfigurationJsonPackageVersion>
+    <MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>2.2.0-rtm-35646</MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>
+    <MicrosoftExtensionsConfigurationPackageVersion>2.2.0-rtm-35646</MicrosoftExtensionsConfigurationPackageVersion>
+    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>2.2.0-rtm-35646</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
+    <MicrosoftExtensionsConfigurationXmlPackageVersion>2.2.0-rtm-35646</MicrosoftExtensionsConfigurationXmlPackageVersion>
     <MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
     <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
     <MicrosoftExtensionsDependencyInjectionPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsDependencyInjectionPackageVersion>
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index 0973eb5ccc..60f4c7bea5 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -19,6 +19,18 @@
     <ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="$(MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsConfigurationFileExtensionsPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Ini" Version="$(MicrosoftExtensionsConfigurationIniPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="$(MicrosoftExtensionsConfigurationKeyPerFilePackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Xml" Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="$(MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="$(MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion)" />
diff --git a/build/repo.targets b/build/repo.targets
index c4a0dd7bce..697ee8f180 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -142,6 +142,7 @@
         <Category>noship</Category>
         <IsLineup>true</IsLineup>
       </ArtifactInfo>
+      <FilesToSign Include="$(BuildDir)Internal.AspNetCore.Universe.Lineup.$(PackageVersion).nupkg" Certificate="$(PackageSigningCertName)" />
     </ItemGroup>
   </Target>
 
diff --git a/build/submodules.props b/build/submodules.props
index bc22327c12..6ca6c0c2c9 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -42,7 +42,6 @@
     <Repository Include="BasicMiddleware" />
     <Repository Include="BrowserLink" />
     <Repository Include="Caching" />
-    <Repository Include="Configuration" />
     <Repository Include="CORS" />
     <Repository Include="DataProtection" RootPath="$(RepositoryRoot)src\DataProtection\" />
     <Repository Include="Diagnostics" />
diff --git a/modules/Configuration b/modules/Configuration
deleted file mode 160000
index 84a60a247c..0000000000
--- a/modules/Configuration
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 84a60a247c7e3b78b228909f938afd2a54b02fcd