From 62b24f930e9f869c803caff23c14e41513df7987 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Mon, 5 Nov 2018 14:19:19 -0800
Subject: [PATCH] Remove the aspnet/FileSystem submodule (#3884)

---
 .gitmodules                       | 4 ----
 build/artifacts.props             | 5 -----
 build/buildorder.props            | 1 -
 build/dependencies.props          | 5 +++++
 build/external-dependencies.props | 7 ++++++-
 build/submodules.props            | 1 -
 modules/FileSystem                | 1 -
 7 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 160000 modules/FileSystem

diff --git a/.gitmodules b/.gitmodules
index ff126b97115..69ad207d6c5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,10 +46,6 @@
 	path = modules/EntityFrameworkCore
 	url = https://github.com/aspnet/EntityFrameworkCore.git
 	branch = release/2.2
-[submodule "modules/FileSystem"]
-	path = modules/FileSystem
-	url = https://github.com/aspnet/FileSystem.git
-	branch = release/2.2
 [submodule "modules/Hosting"]
 	path = modules/Hosting
 	url = https://github.com/aspnet/Hosting.git
diff --git a/build/artifacts.props b/build/artifacts.props
index 9b1e3558d36..50e44951272 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -208,11 +208,6 @@
     <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"  />
-    <PackageArtifact Include="Microsoft.Extensions.FileProviders.Abstractions" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.FileProviders.Composite" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.FileProviders.Embedded" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.FileProviders.Physical" Category="ship" />
-    <PackageArtifact Include="Microsoft.Extensions.FileSystemGlobbing" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Hosting.Abstractions" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Hosting" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Http.Polly" Category="ship" />
diff --git a/build/buildorder.props b/build/buildorder.props
index 24e61bbb1ee..118588c9174 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -7,7 +7,6 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <RepositoryBuildOrder Include="FileSystem" Order="2" />
     <RepositoryBuildOrder Include="JsonPatch" Order="2" />
     <RepositoryBuildOrder Include="Configuration" Order="3" />
     <RepositoryBuildOrder Include="Options" Order="4" />
diff --git a/build/dependencies.props b/build/dependencies.props
index 63a1f595737..3f4590ce298 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -19,6 +19,11 @@
     <MicrosoftExtensionsDependencyInjectionPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsDependencyInjectionPackageVersion>
     <MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion>
     <MicrosoftExtensionsDiagnosticAdapterPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
+    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
+    <MicrosoftExtensionsFileProvidersCompositePackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsFileProvidersCompositePackageVersion>
+    <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
+    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
+    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
     <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
     <MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
     <MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index 1469795b048..0973eb5ccc6 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -14,7 +14,7 @@
     <ExternalDependency Include="Microsoft.AspNetCore.Analyzer.Testing" Version="$(MicrosoftAspNetCoreAnalyzerTestingPackageVersion)" />
     <ExternalDependency Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="$(MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion)" />
     <ExternalDependency Include="Microsoft.AspNetCore.Certificates.Generation.Sources" Version="$(MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion)" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)"  />
+    <ExternalDependency Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
@@ -24,6 +24,11 @@
     <ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="$(MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.DiagnosticAdapter" Version="$(MicrosoftExtensionsDiagnosticAdapterPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Composite" Version="$(MicrosoftExtensionsFileProvidersCompositePackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" />
+    <ExternalDependency Include="Microsoft.Extensions.FileSystemGlobbing"  Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.NonCapturingTimer.Sources" Version="$(MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion)" />
     <ExternalDependency Include="Microsoft.Extensions.ObjectMethodExecutor.Sources" Version="$(MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion)" />
diff --git a/build/submodules.props b/build/submodules.props
index df85c628d4f..bc22327c127 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -48,7 +48,6 @@
     <Repository Include="Diagnostics" />
     <Repository Include="DotNetTools" />
     <Repository Include="EntityFrameworkCore" />
-    <Repository Include="FileSystem" />
     <Repository Include="Hosting" />
     <Repository Include="HtmlAbstractions" />
     <Repository Include="HttpAbstractions" />
diff --git a/modules/FileSystem b/modules/FileSystem
deleted file mode 160000
index da45fac2e60..00000000000
--- a/modules/FileSystem
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit da45fac2e6059b9cadf6b5b28313e22df9f51de1