diff --git a/.gitmodules b/.gitmodules
index 169fe3430f9..bc919e5c904 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,3 @@
-[submodule "submodules/FileSystem"]
-	path = submodules/FileSystem
-	url = https://github.com/NuGet/FileSystem.git
-	branch = NuGet/SubModuleIntegration
-[submodule "submodules/Common"]
-	path = submodules/Common
-	url = https://github.com/aspnet/Common.git
-	branch = NuGet/SubModuleIntegration
 [submodule "submodules/NuGet.Build.Localization"]
 	path = submodules/NuGet.Build.Localization
 	url = https://github.com/NuGet/NuGet.Build.Localization.git
diff --git a/build/bootstrap.proj b/build/bootstrap.proj
index 7ebc89e34fb..4d4215111c4 100644
--- a/build/bootstrap.proj
+++ b/build/bootstrap.proj
@@ -18,7 +18,7 @@
         <PackageDownload Include="Microsoft.Web.Xdt" version="[3.0.0]" />
         <PackageDownload Include="Newtonsoft.Json" version="[13.0.1]" />
         <PackageDownload Include="NuGet.Client.EndToEnd.TestData" version="[1.0.0]" />
-        <PackageDownload Include="NuGetValidator" version="[2.0.3]" />
+        <PackageDownload Include="NuGetValidator" version="[2.0.5]" />
     </ItemGroup>
 
 </Project>
diff --git a/build/packages.targets b/build/packages.targets
index f7573785975..f8c6b049f5d 100644
--- a/build/packages.targets
+++ b/build/packages.targets
@@ -36,6 +36,8 @@
         <PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" />
         <PackageReference Update="Microsoft.DataAI.NuGetRecommender.Contracts" Version="2.1.0" />
         <PackageReference Update="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
+        <PackageReference Update="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0"/>
+        <PackageReference Update="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0" />
         <PackageReference Update="Microsoft.Internal.VisualStudio.Shell.Framework" Version="$(VSFrameworkVersion)" />
         <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" />
         <PackageReference Update="Microsoft.TeamFoundationServer.ExtendedClient" Version="$(VSServicesVersion)" />
@@ -50,6 +52,7 @@
         <PackageReference Update="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
         <PackageReference Update="SharpZipLib" Version="1.3.3" />
         <PackageReference Update="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionPackageVersion)" />
+        <PackageReference Update="System.Runtime.Serialization.Primitives" Version="$(SystemPackagesVersion)" />
         <!--
           The Microsoft.VisualStudio.SDK metapackage brings in System.Threading.Tasks.Dataflow 4.11.1 (assembly version 4.9.5.0).
           However, our MSBuild integration tests use Microsoft.Build 16.8.0, which requires System.Threading.Tasks.Dataflow 4.9.0 (assembly version 4.9.3.0).
diff --git a/eng/pipelines/templates/Build_and_UnitTest.yml b/eng/pipelines/templates/Build_and_UnitTest.yml
index 0775355bed2..ae7468222fd 100644
--- a/eng/pipelines/templates/Build_and_UnitTest.yml
+++ b/eng/pipelines/templates/Build_and_UnitTest.yml
@@ -435,7 +435,7 @@ steps:
   inputs:
     artifactName: LocValidationLogs
     targetPath: "$(Build.Repository.LocalPath)\\logs\\LocalizationValidation"
-  condition: "and(succeeded(), eq(variables['BuildRTM'], 'false'))"
+  condition: "and(succeededOrFailed(), eq(variables['BuildRTM'], 'false'))"
 
   # Use dotnet msbuild instead of MSBuild CLI.
   # Using MSBuild CLI results in an assembly binding failure for NuGet.Common.dll 4.4.0.3 because Microsoft.DotNet.Build.Tasks.Feed.dll references SleetLib.dll which references NuGet.Common 4.4.0.3.
diff --git a/scripts/cibuild/BuildValidator.ps1 b/scripts/cibuild/BuildValidator.ps1
index e9e7ba7d8b5..a9c7f0d6076 100644
--- a/scripts/cibuild/BuildValidator.ps1
+++ b/scripts/cibuild/BuildValidator.ps1
@@ -38,7 +38,7 @@ param
 
 if ($BuildRTM -eq 'false')
 {
-    $NuGetValidator = [System.IO.Path]::Combine($RepoRoot, 'packages', 'nugetvalidator', '2.0.3', 'tools', 'NuGetValidator.exe')
+    $NuGetValidator = [System.IO.Path]::Combine($RepoRoot, 'packages', 'nugetvalidator', '2.0.5', 'tools', 'NuGetValidator.exe')
     $LocalizationRepository = [System.IO.Path]::Combine($RepoRoot, 'submodules', 'NuGet.Build.Localization', 'localize', 'comments', '15')
 
     if ($ValidateVsix)
diff --git a/setup/Microsoft.VisualStudio.NuGet.BuildTools.swr b/setup/Microsoft.VisualStudio.NuGet.BuildTools.swr
index bfc2eca1ed4..b9d60cd854e 100644
--- a/setup/Microsoft.VisualStudio.NuGet.BuildTools.swr
+++ b/setup/Microsoft.VisualStudio.NuGet.BuildTools.swr
@@ -8,6 +8,9 @@ folder InstallDir:\Common7\IDE\CommonExtensions\Microsoft\NuGet
         file source=$(NuGetTargetsBasePath)NuGet.targets
         file source=$(NuGetTargetsBasePath)NuGet.props
         file source=$(NuGetTargetsBasePath)NuGet.RestoreEx.targets
+        file source=$(ReferenceOutputPath)Microsoft.Extensions.FileProviders.Abstractions.dll
+        file source=$(ReferenceOutputPath)Microsoft.Extensions.FileSystemGlobbing.dll
+        file source=$(ReferenceOutputPath)Microsoft.Extensions.Primitives.dll
         file source=$(ReferenceOutputPath)Microsoft.Web.XmlTransform.dll
         file source=$(ReferenceOutputPath)Microsoft.Build.NuGetSdkResolver.dll
         file source=$(NewtonsoftJsonPath)Newtonsoft.Json.dll
diff --git a/src/NuGet.Clients/NuGet.CommandLine/ilmerge.props b/src/NuGet.Clients/NuGet.CommandLine/ilmerge.props
index ff88881fa69..33b9faed9a9 100644
--- a/src/NuGet.Clients/NuGet.CommandLine/ilmerge.props
+++ b/src/NuGet.Clients/NuGet.CommandLine/ilmerge.props
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0">
   <ItemGroup>
+    <MergeInclude Include="$(OutputPath)Microsoft.Extensions.FileProviders.Abstractions.dll"/>
+    <MergeInclude Include="$(OutputPath)Microsoft.Extensions.FileSystemGlobbing.dll"/>
+    <MergeInclude Include="$(OutputPath)Microsoft.Extensions.Primitives.dll"/>
     <MergeInclude Include="$(OutputPath)Microsoft.Web.XmlTransform.dll"/>
     <MergeInclude Include="$(OutputPath)Newtonsoft.Json.dll"/>
     <MergeInclude Include="$(OutputPath)NuGet.Build.Tasks.dll"/>
@@ -18,11 +21,13 @@
     <MergeInclude Include="$(OutputPath)NuGet.Resolver.dll"/>
     <MergeInclude Include="$(OutputPath)NuGet.Versioning.dll"/>
     <MergeInclude Include="$(OutputPath)NuGet.Core.dll"/>
+    <MergeInclude Include="$(OutputPath)System.Memory.dll"/>
     <MergeInclude Include="$(OutputPath)System.Threading.Tasks.Dataflow.dll"/>
 
     <MergeExclude Include="$(OutputPath)Microsoft.VisualStudio.Setup.Configuration.Interop.dll"/>
     <MergeExclude Include="$(OutputPath)Microsoft.CSharp.dll"/>
     <MergeExclude Include="$(OutputPath)mscorlib.dll"/>
+    <MergeExclude Include="$(OutputPath)System.Buffers.dll"/>
     <MergeExclude Include="$(OutputPath)System.Collections.Concurrent.dll"/>
     <MergeExclude Include="$(OutputPath)System.Collections.dll"/>
     <MergeExclude Include="$(OutputPath)System.ComponentModel.Composition.dll"/>
@@ -32,8 +37,10 @@
     <MergeExclude Include="$(OutputPath)System.IO.Compression.dll"/>
     <MergeExclude Include="$(OutputPath)System.Net.Http.dll"/>
     <MergeExclude Include="$(OutputPath)System.Net.Http.WebRequest.dll"/>
+    <MergeExclude Include="$(OutputPath)System.Numerics.Vectors.dll"/>
     <MergeExclude Include="$(OutputPath)System.Runtime.dll"/>
     <MergeExclude Include="$(OutputPath)System.Runtime.Serialization.dll"/>
+    <MergeExclude Include="$(OutputPath)System.Runtime.CompilerServices.Unsafe.dll"/>
     <MergeExclude Include="$(OutputPath)System.Security.dll"/>
     <MergeExclude Include="$(OutputPath)System.ServiceModel.dll"/>
     <MergeExclude Include="$(OutputPath)System.Xml.dll"/>
diff --git a/src/NuGet.Clients/NuGet.MSSigning.Extensions/ilmerge.props b/src/NuGet.Clients/NuGet.MSSigning.Extensions/ilmerge.props
index 7d9686b3bff..55c6dc7c5ab 100644
--- a/src/NuGet.Clients/NuGet.MSSigning.Extensions/ilmerge.props
+++ b/src/NuGet.Clients/NuGet.MSSigning.Extensions/ilmerge.props
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0">
   <ItemGroup>
+    <MergeInclude Include="$(OutputPath)Microsoft.Extensions.FileProviders.Abstractions.dll"/>
+    <MergeInclude Include="$(OutputPath)Microsoft.Extensions.FileSystemGlobbing.dll"/>
+    <MergeInclude Include="$(OutputPath)Microsoft.Extensions.Primitives.dll"/>
     <MergeInclude Include="$(OutputPath)Microsoft.Web.XmlTransform.dll"/>
     <MergeInclude Include="$(OutputPath)Newtonsoft.Json.dll"/>
     <MergeInclude Include="$(OutputPath)NuGet.Build.Tasks.dll"/>
@@ -19,11 +22,13 @@
     <MergeInclude Include="$(OutputPath)NuGet.Versioning.dll"/>
     <MergeInclude Include="$(OutputPath)NuGet.Core.dll"/>
     <MergeInclude Include="$(OutputPath)NuGet.MSSigning.Extensions.dll"/>
+    <MergeInclude Include="$(OutputPath)System.Memory.dll"/>
     <MergeInclude Include="$(OutputPath)System.Threading.Tasks.Dataflow.dll"/>
 
     <MergeExclude Include="$(OutputPath)Microsoft.VisualStudio.Setup.Configuration.Interop.dll"/>
     <MergeExclude Include="$(OutputPath)Microsoft.CSharp.dll"/>
     <MergeExclude Include="$(OutputPath)mscorlib.dll"/>
+    <MergeExclude Include="$(OutputPath)System.Buffers.dll"/>
     <MergeExclude Include="$(OutputPath)System.Collections.Concurrent.dll"/>
     <MergeExclude Include="$(OutputPath)System.Collections.dll"/>
     <MergeExclude Include="$(OutputPath)System.ComponentModel.Composition.dll"/>
@@ -33,8 +38,10 @@
     <MergeExclude Include="$(OutputPath)System.IO.Compression.dll"/>
     <MergeExclude Include="$(OutputPath)System.Net.Http.dll"/>
     <MergeExclude Include="$(OutputPath)System.Net.Http.WebRequest.dll"/>
+    <MergeExclude Include="$(OutputPath)System.Numerics.Vectors.dll"/>
     <MergeExclude Include="$(OutputPath)System.Runtime.dll"/>
     <MergeExclude Include="$(OutputPath)System.Runtime.Serialization.dll"/>
+    <MergeExclude Include="$(OutputPath)System.Runtime.CompilerServices.Unsafe.dll"/>
     <MergeExclude Include="$(OutputPath)System.Security.dll"/>
     <MergeExclude Include="$(OutputPath)System.ServiceModel.dll"/>
     <MergeExclude Include="$(OutputPath)System.Xml.dll"/>
diff --git a/src/NuGet.Clients/NuGet.SolutionRestoreManager/Properties/AssemblyInfo.cs b/src/NuGet.Clients/NuGet.SolutionRestoreManager/Properties/AssemblyInfo.cs
index 4d0fb05b1d9..84a922f67ac 100644
--- a/src/NuGet.Clients/NuGet.SolutionRestoreManager/Properties/AssemblyInfo.cs
+++ b/src/NuGet.Clients/NuGet.SolutionRestoreManager/Properties/AssemblyInfo.cs
@@ -21,6 +21,9 @@
 [assembly: Guid("06662133-1292-4918-90f3-36c930c0b16f")]
 
 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Lucene.Net.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.FileProviders.Abstractions.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.FileSystemGlobbing.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.Primitives.dll")]
 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Newtonsoft.Json.dll")]
 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\NuGet.Commands.dll")]
 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\NuGet.Common.dll")]
diff --git a/src/NuGet.Clients/NuGet.Tools/Properties/AssemblyInfo.cs b/src/NuGet.Clients/NuGet.Tools/Properties/AssemblyInfo.cs
index f1b13075525..0b38a920650 100644
--- a/src/NuGet.Clients/NuGet.Tools/Properties/AssemblyInfo.cs
+++ b/src/NuGet.Clients/NuGet.Tools/Properties/AssemblyInfo.cs
@@ -11,6 +11,9 @@
 [assembly: ComVisible(false)]
 
 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Lucene.Net.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.FileProviders.Abstractions.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.FileSystemGlobbing.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.Primitives.dll")]
 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Web.XmlTransform.dll")]
 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Newtonsoft.Json.dll")]
 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\NuGet.Commands.dll")]
diff --git a/src/NuGet.Clients/NuGet.VisualStudio.Client/.vsixinclude b/src/NuGet.Clients/NuGet.VisualStudio.Client/.vsixinclude
index 0ee5831c46c..650179d6392 100644
--- a/src/NuGet.Clients/NuGet.VisualStudio.Client/.vsixinclude
+++ b/src/NuGet.Clients/NuGet.VisualStudio.Client/.vsixinclude
@@ -34,5 +34,8 @@ NuGet.Versioning.dll
 
 # 3rd party dlls to keep
 Lucene.Net.dll
+Microsoft.Extensions.FileProviders.Abstractions.dll
+Microsoft.Extensions.FileSystemGlobbing.dll
+Microsoft.Extensions.Primitives.dll
 Microsoft.Web.XmlTransform.dll
 Newtonsoft.Json.dll
diff --git a/src/NuGet.Clients/NuGet.VisualStudio.Client/source.extension.vsixmanifest b/src/NuGet.Clients/NuGet.VisualStudio.Client/source.extension.vsixmanifest
index c360de06e7e..6f03f6f264f 100644
--- a/src/NuGet.Clients/NuGet.VisualStudio.Client/source.extension.vsixmanifest
+++ b/src/NuGet.Clients/NuGet.VisualStudio.Client/source.extension.vsixmanifest
@@ -66,6 +66,9 @@
         <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="NuGet.VisualStudio.OnlineEnvironment.Client" Path="|NuGet.VisualStudio.OnlineEnvironment.Client|" />
 
         <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Lucene.Net.dll" AssemblyName="Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Microsoft.Extensions.FileProviders.Abstractions.dll" AssemblyName="Microsoft.Extensions.FileProviders.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Microsoft.Extensions.FileSystemGlobbing.dll" AssemblyName="Microsoft.Extensions.FileSystemGlobbing, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Microsoft.Extensions.Primitives.dll" AssemblyName="Microsoft.Extensions.Primitives, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60" />
         <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Microsoft.Web.XmlTransform.dll" AssemblyName="Microsoft.Web.XmlTransform, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
         <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Newtonsoft.Json.dll" AssemblyName="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed" />
     </Assets>
diff --git a/src/NuGet.Clients/NuGet.VisualStudio.OnlineEnvironment.Client/Properties/AssemblyInfo.cs b/src/NuGet.Clients/NuGet.VisualStudio.OnlineEnvironment.Client/Properties/AssemblyInfo.cs
index dc12bd6b0c1..2069b84c842 100644
--- a/src/NuGet.Clients/NuGet.VisualStudio.OnlineEnvironment.Client/Properties/AssemblyInfo.cs
+++ b/src/NuGet.Clients/NuGet.VisualStudio.OnlineEnvironment.Client/Properties/AssemblyInfo.cs
@@ -17,6 +17,9 @@
 [assembly: ComVisible(false)]
 
 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Lucene.Net.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.FileProviders.Abstractions.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.FileSystemGlobbing.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.Primitives.dll")]
 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Web.XmlTransform.dll")]
 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Newtonsoft.Json.dll")]
 [assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\NuGet.Commands.dll")]
diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
index eb2614fffd5..820b2c4efd8 100644
--- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
+++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
@@ -113,6 +113,7 @@
         /out:$(PathToMergedNuGetPack) ^
         $(ILMergePlatformArg) ^
         /lib:$(OutputPath)publish ^
+        /allowDup ^
         /internalize ^
         /xmldocs ^
         /log:$(ILMergeResultDir)IlMergeLog.txt</IlmergeCommand>
@@ -153,6 +154,7 @@
         /out:$(PathToMergedNuGetPackResource) ^
         $(ILMergePlatformArg) ^
         /log ^
+        /allowDup ^
         /lib:$(OutputPath)\publish ^
         /internalize ^
         /xmldocs ^
diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
index e8d4a5e93ec..69b163c5dff 100644
--- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
+++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
@@ -20,6 +20,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="All" />
     <PackageReference Include="System.Diagnostics.Debug" />
+    <PackageReference Include="System.Runtime.Serialization.Primitives" />
   </ItemGroup>
 
   <!-- Microsoft.Build.Locator is needed when debugging, but should not be used in the assemblies we insert.
diff --git a/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj b/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj
index a02132ec13a..953448cfff2 100644
--- a/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj
+++ b/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj
@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'NuGet.sln'))\build\common.props" />
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
@@ -22,8 +22,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="..\..\..\submodules\FileSystem\src\**\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\submodules\FileSystem\src\Microsoft.Extensions.FileSystemGlobbing\**\*.cs;..\..\..\submodules\FileSystem\src\Microsoft.AspNet.FileProviders.Abstractions\**\*.cs;..\..\..\submodules\FileSystem\src\Microsoft.AspNet.FileProviders.Sources\**\*.cs;..\..\..\submodules\Common\src\Microsoft.Extensions.Primitives\IChangeToken.cs" Exclude="..\..\..\submodules\FileSystem\src\**\AssemblyInfo.cs;bin\**;obj\**;**\*.xproj;packages\**" />
+    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/NuGet.Core/NuGet.Commands/PublicAPI/net472/PublicAPI.Shipped.txt b/src/NuGet.Core/NuGet.Commands/PublicAPI/net472/PublicAPI.Shipped.txt
index 9c34f1fe012..ce1e7cba617 100644
--- a/src/NuGet.Core/NuGet.Commands/PublicAPI/net472/PublicAPI.Shipped.txt
+++ b/src/NuGet.Core/NuGet.Commands/PublicAPI/net472/PublicAPI.Shipped.txt
@@ -1,143 +1,3 @@
-Microsoft.AspNet.FileProviders.IDirectoryContents
-Microsoft.AspNet.FileProviders.IDirectoryContents.Exists.get -> bool
-Microsoft.AspNet.FileProviders.IFileInfo
-Microsoft.AspNet.FileProviders.IFileInfo.CreateReadStream() -> System.IO.Stream
-Microsoft.AspNet.FileProviders.IFileInfo.Exists.get -> bool
-Microsoft.AspNet.FileProviders.IFileInfo.IsDirectory.get -> bool
-Microsoft.AspNet.FileProviders.IFileInfo.LastModified.get -> System.DateTimeOffset
-Microsoft.AspNet.FileProviders.IFileInfo.Length.get -> long
-Microsoft.AspNet.FileProviders.IFileInfo.Name.get -> string
-Microsoft.AspNet.FileProviders.IFileInfo.PhysicalPath.get -> string
-Microsoft.AspNet.FileProviders.IFileProvider
-Microsoft.AspNet.FileProviders.IFileProvider.GetDirectoryContents(string subpath) -> Microsoft.AspNet.FileProviders.IDirectoryContents
-Microsoft.AspNet.FileProviders.IFileProvider.GetFileInfo(string subpath) -> Microsoft.AspNet.FileProviders.IFileInfo
-Microsoft.AspNet.FileProviders.IFileProvider.Watch(string filter) -> Microsoft.Extensions.Primitives.IChangeToken
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase.DirectoryInfoBase() -> void
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.DirectoryInfoWrapper(System.IO.DirectoryInfo directoryInfo, bool isParentPath = false) -> void
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase.FileInfoBase() -> void
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper.FileInfoWrapper(System.IO.FileInfo fileInfo) -> void
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.FileSystemInfoBase() -> void
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.Equals(Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch other) -> bool
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.FilePatternMatch(string path, string stem) -> void
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.Path.get -> string
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.Stem.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern.Segments.get -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern.CreatePatternContextForExclude() -> Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern.CreatePatternContextForInclude() -> Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.Declare(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment, bool> onDeclare) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.PopDirectory() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.PushDirectory(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase file) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.Contains.get -> System.Collections.Generic.IList<System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>>
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.EndsWith.get -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.Segments.get -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.StartsWith.get -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.MatcherContext
-Microsoft.Extensions.FileSystemGlobbing.Internal.MatcherContext.Execute() -> Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult
-Microsoft.Extensions.FileSystemGlobbing.Internal.MatcherContext.MatcherContext(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern> includePatterns, System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern> excludePatterns, Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directoryInfo, System.StringComparison comparison) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.CurrentPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.CurrentPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.CurrentPathSegment.CurrentPathSegment() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.CurrentPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.LiteralPathSegment(string value, System.StringComparison comparisonType) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.Value.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.ParentPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.ParentPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.ParentPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.ParentPathSegment.ParentPathSegment() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.RecursiveWildcardSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.RecursiveWildcardSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.RecursiveWildcardSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.RecursiveWildcardSegment.RecursiveWildcardSegment() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.BeginsWith.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.Contains.get -> System.Collections.Generic.List<string>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.EndsWith.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.WildcardPathSegment(string beginsWith, System.Collections.Generic.List<string> contains, string endsWith, System.StringComparison comparisonType) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.Frame -> TFrame
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.IsStackEmpty() -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.PatternContext() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.PopDirectory() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.PushDataFrame(TFrame frame) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.CalculateStem(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase matchedFile) -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.FrameData() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.InStem -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.IsNotApplicable -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.SegmentIndex -> int
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.Stem.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.StemItems.get -> System.Collections.Generic.IList<string>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.IsLastSegment() -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.Pattern.get -> Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.PatternContextLinear(Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.TestMatchingSegment(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearExclude
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearExclude.PatternContextLinearExclude(Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearInclude
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearInclude.PatternContextLinearInclude(Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.CalculateStem(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase matchedFile) -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.BacktrackAvailable -> int
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.FrameData() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.InStem -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.IsNotApplicable -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.SegmentGroup -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.SegmentGroupIndex -> int
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.SegmentIndex -> int
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.Stem.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.StemItems.get -> System.Collections.Generic.IList<string>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.IsEndingGroup() -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.IsStartingGroup() -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.Pattern.get -> Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.PatternContextRagged(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.TestMatchingGroup(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.TestMatchingSegment(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedExclude
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedExclude.PatternContextRaggedExclude(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedInclude
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedInclude.PatternContextRaggedInclude(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult.IsSuccessful.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult.Stem.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder.Build(string pattern) -> Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder.ComparisonType.get -> System.StringComparison
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder.PatternBuilder() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder.PatternBuilder(System.StringComparison comparisonType) -> void
-Microsoft.Extensions.FileSystemGlobbing.Matcher
-Microsoft.Extensions.FileSystemGlobbing.Matcher.Matcher() -> void
-Microsoft.Extensions.FileSystemGlobbing.Matcher.Matcher(System.StringComparison comparisonType) -> void
-Microsoft.Extensions.FileSystemGlobbing.MatcherExtensions
-Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult
-Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult.Files.get -> System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch>
-Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult.Files.set -> void
-Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult.PatternMatchingResult(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch> files) -> void
-Microsoft.Extensions.Primitives.IChangeToken
-Microsoft.Extensions.Primitives.IChangeToken.ActiveChangeCallbacks.get -> bool
-Microsoft.Extensions.Primitives.IChangeToken.HasChanged.get -> bool
-Microsoft.Extensions.Primitives.IChangeToken.RegisterChangeCallback(System.Action<object> callback, object state) -> System.IDisposable
 NuGet.Commands.AddClientCertArgs
 NuGet.Commands.AddClientCertArgs.AddClientCertArgs() -> void
 NuGet.Commands.AddClientCertArgs.Configfile.get -> string
@@ -968,39 +828,8 @@ NuGet.Commands.WarningPropertiesCollection.PackageSpecificWarningProperties.get
 NuGet.Commands.WarningPropertiesCollection.ProjectFrameworks.get -> System.Collections.Generic.IReadOnlyList<NuGet.Frameworks.NuGetFramework>
 NuGet.Commands.WarningPropertiesCollection.ProjectWideWarningProperties.get -> NuGet.ProjectModel.WarningProperties
 NuGet.Commands.WarningPropertiesCollection.WarningPropertiesCollection(NuGet.ProjectModel.WarningProperties projectWideWarningProperties, NuGet.Commands.PackageSpecificWarningProperties packageSpecificWarningProperties, System.Collections.Generic.IReadOnlyList<NuGet.Frameworks.NuGetFramework> projectFrameworks) -> void
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase.EnumerateFileSystemInfos() -> System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase>
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase.GetDirectory(string path) -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase.GetFile(string path) -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.FullName.get -> string
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.Name.get -> string
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.ParentDirectory.get -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-abstract Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.PushDirectory(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> void
-abstract Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-abstract Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase file) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
 const NuGet.Commands.BuildAssetsUtils.PropsExtension = ".props" -> string
 const NuGet.Commands.BuildAssetsUtils.TargetsExtension = ".targets" -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.EnumerateFileSystemInfos() -> System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase>
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.FullName.get -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.GetDirectory(string name) -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.GetFile(string name) -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.Name.get -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.ParentDirectory.get -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper.FullName.get -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper.Name.get -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper.ParentDirectory.get -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-override Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.Equals(object obj) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.GetHashCode() -> int
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.Equals(object obj) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.GetHashCode() -> int
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.PushDirectory(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> void
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase file) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearExclude.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearInclude.Declare(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment, bool> onDeclare) -> void
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearInclude.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase file) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedExclude.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedInclude.Declare(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment, bool> onDeclare) -> void
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedInclude.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
 override NuGet.Commands.CompatibilityIssue.ToString() -> string
 override NuGet.Commands.MSBuildItem.ToString() -> string
 override NuGet.Commands.NoOpRestoreResult.CommitAsync(NuGet.Common.ILogger log, System.Threading.CancellationToken token) -> System.Threading.Tasks.Task
@@ -1023,11 +852,6 @@ override NuGet.Commands.TransitiveNoWarnUtils.NodeWarningProperties.Equals(objec
 override NuGet.Commands.TransitiveNoWarnUtils.NodeWarningProperties.GetHashCode() -> int
 override NuGet.Commands.WarningPropertiesCollection.Equals(object obj) -> bool
 override NuGet.Commands.WarningPropertiesCollection.GetHashCode() -> int
-override sealed Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.PushDirectory(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> void
-static Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult.Success(string stem) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-static Microsoft.Extensions.FileSystemGlobbing.MatcherExtensions.AddExcludePatterns(this Microsoft.Extensions.FileSystemGlobbing.Matcher matcher, params System.Collections.Generic.IEnumerable<string>[] excludePatternsGroups) -> void
-static Microsoft.Extensions.FileSystemGlobbing.MatcherExtensions.AddIncludePatterns(this Microsoft.Extensions.FileSystemGlobbing.Matcher matcher, params System.Collections.Generic.IEnumerable<string>[] includePatternsGroups) -> void
-static Microsoft.Extensions.FileSystemGlobbing.MatcherExtensions.GetResultsInFullPath(this Microsoft.Extensions.FileSystemGlobbing.Matcher matcher, string directoryPath) -> System.Collections.Generic.IEnumerable<string>
 static NuGet.Commands.AddClientCertRunner.Run(NuGet.Commands.AddClientCertArgs args, System.Func<NuGet.Common.ILogger> getLogger) -> void
 static NuGet.Commands.AddSourceRunner.Run(NuGet.Commands.AddSourceArgs args, System.Func<NuGet.Common.ILogger> getLogger) -> void
 static NuGet.Commands.AssetTargetFallbackUtility.ApplyFramework(NuGet.ProjectModel.TargetFrameworkInformation targetFrameworkInfo, System.Collections.Generic.IEnumerable<NuGet.Frameworks.NuGetFramework> packageTargetFallback, System.Collections.Generic.IEnumerable<NuGet.Frameworks.NuGetFramework> assetTargetFallback) -> void
@@ -1172,8 +996,6 @@ static NuGet.Commands.UpdateClientCertRunner.Run(NuGet.Commands.UpdateClientCert
 static NuGet.Commands.UpdateSourceRunner.Run(NuGet.Commands.UpdateSourceArgs args, System.Func<NuGet.Common.ILogger> getLogger) -> void
 static NuGet.Commands.WarningPropertiesCollection.ApplyProjectWideNoWarnProperties(NuGet.Common.ILogMessage message, NuGet.ProjectModel.WarningProperties warningProperties) -> bool
 static NuGet.Commands.WarningPropertiesCollection.ApplyProjectWideWarningsAsErrorProperties(NuGet.Common.ILogMessage message, NuGet.ProjectModel.WarningProperties warningProperties) -> void
-static readonly Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.MatchAll -> Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment
-static readonly Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult.Failed -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
 static readonly NuGet.Commands.AssetTargetFallbackUtility.AssetTargetFallback -> string
 static readonly NuGet.Commands.BuildAssetsUtils.MacroCandidates -> string[]
 static readonly NuGet.Commands.LockFileUtils.LIBANY -> string
@@ -1181,10 +1003,6 @@ static readonly NuGet.Commands.MSBuildRestoreItemGroup.ImportGroup -> string
 static readonly NuGet.Commands.MSBuildRestoreItemGroup.ItemGroup -> string
 static readonly NuGet.Commands.MSBuildRestoreUtility.Clear -> string
 static readonly NuGet.Commands.RestoreRequest.DefaultDegreeOfConcurrency -> int
-virtual Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.Declare(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment, bool> declare) -> void
-virtual Microsoft.Extensions.FileSystemGlobbing.Matcher.AddExclude(string pattern) -> Microsoft.Extensions.FileSystemGlobbing.Matcher
-virtual Microsoft.Extensions.FileSystemGlobbing.Matcher.AddInclude(string pattern) -> Microsoft.Extensions.FileSystemGlobbing.Matcher
-virtual Microsoft.Extensions.FileSystemGlobbing.Matcher.Execute(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directoryInfo) -> Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult
 virtual NuGet.Commands.DependencyGraphFileRequestProvider.CreateRequests(string inputPath, NuGet.Commands.RestoreArgs restoreContext) -> System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<NuGet.Commands.RestoreSummaryRequest>>
 virtual NuGet.Commands.DependencyGraphFileRequestProvider.Supports(string path) -> System.Threading.Tasks.Task<bool>
 virtual NuGet.Commands.RestoreResult.CommitAsync(NuGet.Common.ILogger log, System.Threading.CancellationToken token) -> System.Threading.Tasks.Task
diff --git a/src/NuGet.Core/NuGet.Commands/PublicAPI/netcoreapp5.0/PublicAPI.Shipped.txt b/src/NuGet.Core/NuGet.Commands/PublicAPI/netcoreapp5.0/PublicAPI.Shipped.txt
index 367ef869827..d287a6eb57f 100644
--- a/src/NuGet.Core/NuGet.Commands/PublicAPI/netcoreapp5.0/PublicAPI.Shipped.txt
+++ b/src/NuGet.Core/NuGet.Commands/PublicAPI/netcoreapp5.0/PublicAPI.Shipped.txt
@@ -1,143 +1,3 @@
-Microsoft.AspNet.FileProviders.IDirectoryContents
-Microsoft.AspNet.FileProviders.IDirectoryContents.Exists.get -> bool
-Microsoft.AspNet.FileProviders.IFileInfo
-Microsoft.AspNet.FileProviders.IFileInfo.CreateReadStream() -> System.IO.Stream
-Microsoft.AspNet.FileProviders.IFileInfo.Exists.get -> bool
-Microsoft.AspNet.FileProviders.IFileInfo.IsDirectory.get -> bool
-Microsoft.AspNet.FileProviders.IFileInfo.LastModified.get -> System.DateTimeOffset
-Microsoft.AspNet.FileProviders.IFileInfo.Length.get -> long
-Microsoft.AspNet.FileProviders.IFileInfo.Name.get -> string
-Microsoft.AspNet.FileProviders.IFileInfo.PhysicalPath.get -> string
-Microsoft.AspNet.FileProviders.IFileProvider
-Microsoft.AspNet.FileProviders.IFileProvider.GetDirectoryContents(string subpath) -> Microsoft.AspNet.FileProviders.IDirectoryContents
-Microsoft.AspNet.FileProviders.IFileProvider.GetFileInfo(string subpath) -> Microsoft.AspNet.FileProviders.IFileInfo
-Microsoft.AspNet.FileProviders.IFileProvider.Watch(string filter) -> Microsoft.Extensions.Primitives.IChangeToken
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase.DirectoryInfoBase() -> void
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.DirectoryInfoWrapper(System.IO.DirectoryInfo directoryInfo, bool isParentPath = false) -> void
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase.FileInfoBase() -> void
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper.FileInfoWrapper(System.IO.FileInfo fileInfo) -> void
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.FileSystemInfoBase() -> void
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.Equals(Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch other) -> bool
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.FilePatternMatch(string path, string stem) -> void
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.Path.get -> string
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.Stem.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern.Segments.get -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern.CreatePatternContextForExclude() -> Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern.CreatePatternContextForInclude() -> Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.Declare(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment, bool> onDeclare) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.PopDirectory() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.PushDirectory(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase file) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.Contains.get -> System.Collections.Generic.IList<System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>>
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.EndsWith.get -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.Segments.get -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.StartsWith.get -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.MatcherContext
-Microsoft.Extensions.FileSystemGlobbing.Internal.MatcherContext.Execute() -> Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult
-Microsoft.Extensions.FileSystemGlobbing.Internal.MatcherContext.MatcherContext(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern> includePatterns, System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern> excludePatterns, Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directoryInfo, System.StringComparison comparison) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.CurrentPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.CurrentPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.CurrentPathSegment.CurrentPathSegment() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.CurrentPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.LiteralPathSegment(string value, System.StringComparison comparisonType) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.Value.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.ParentPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.ParentPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.ParentPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.ParentPathSegment.ParentPathSegment() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.RecursiveWildcardSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.RecursiveWildcardSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.RecursiveWildcardSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.RecursiveWildcardSegment.RecursiveWildcardSegment() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.BeginsWith.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.Contains.get -> System.Collections.Generic.List<string>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.EndsWith.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.WildcardPathSegment(string beginsWith, System.Collections.Generic.List<string> contains, string endsWith, System.StringComparison comparisonType) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.Frame -> TFrame
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.IsStackEmpty() -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.PatternContext() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.PopDirectory() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.PushDataFrame(TFrame frame) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.CalculateStem(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase matchedFile) -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.FrameData() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.InStem -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.IsNotApplicable -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.SegmentIndex -> int
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.Stem.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.StemItems.get -> System.Collections.Generic.IList<string>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.IsLastSegment() -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.Pattern.get -> Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.PatternContextLinear(Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.TestMatchingSegment(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearExclude
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearExclude.PatternContextLinearExclude(Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearInclude
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearInclude.PatternContextLinearInclude(Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.CalculateStem(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase matchedFile) -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.BacktrackAvailable -> int
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.FrameData() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.InStem -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.IsNotApplicable -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.SegmentGroup -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.SegmentGroupIndex -> int
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.SegmentIndex -> int
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.Stem.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.StemItems.get -> System.Collections.Generic.IList<string>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.IsEndingGroup() -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.IsStartingGroup() -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.Pattern.get -> Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.PatternContextRagged(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.TestMatchingGroup(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.TestMatchingSegment(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedExclude
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedExclude.PatternContextRaggedExclude(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedInclude
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedInclude.PatternContextRaggedInclude(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult.IsSuccessful.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult.Stem.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder.Build(string pattern) -> Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder.ComparisonType.get -> System.StringComparison
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder.PatternBuilder() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder.PatternBuilder(System.StringComparison comparisonType) -> void
-Microsoft.Extensions.FileSystemGlobbing.Matcher
-Microsoft.Extensions.FileSystemGlobbing.Matcher.Matcher() -> void
-Microsoft.Extensions.FileSystemGlobbing.Matcher.Matcher(System.StringComparison comparisonType) -> void
-Microsoft.Extensions.FileSystemGlobbing.MatcherExtensions
-Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult
-Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult.Files.get -> System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch>
-Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult.Files.set -> void
-Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult.PatternMatchingResult(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch> files) -> void
-Microsoft.Extensions.Primitives.IChangeToken
-Microsoft.Extensions.Primitives.IChangeToken.ActiveChangeCallbacks.get -> bool
-Microsoft.Extensions.Primitives.IChangeToken.HasChanged.get -> bool
-Microsoft.Extensions.Primitives.IChangeToken.RegisterChangeCallback(System.Action<object> callback, object state) -> System.IDisposable
 NuGet.Commands.AddClientCertArgs
 NuGet.Commands.AddClientCertArgs.AddClientCertArgs() -> void
 NuGet.Commands.AddClientCertArgs.Configfile.get -> string
@@ -967,39 +827,8 @@ NuGet.Commands.WarningPropertiesCollection.PackageSpecificWarningProperties.get
 NuGet.Commands.WarningPropertiesCollection.ProjectFrameworks.get -> System.Collections.Generic.IReadOnlyList<NuGet.Frameworks.NuGetFramework>
 NuGet.Commands.WarningPropertiesCollection.ProjectWideWarningProperties.get -> NuGet.ProjectModel.WarningProperties
 NuGet.Commands.WarningPropertiesCollection.WarningPropertiesCollection(NuGet.ProjectModel.WarningProperties projectWideWarningProperties, NuGet.Commands.PackageSpecificWarningProperties packageSpecificWarningProperties, System.Collections.Generic.IReadOnlyList<NuGet.Frameworks.NuGetFramework> projectFrameworks) -> void
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase.EnumerateFileSystemInfos() -> System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase>
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase.GetDirectory(string path) -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase.GetFile(string path) -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.FullName.get -> string
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.Name.get -> string
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.ParentDirectory.get -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-abstract Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.PushDirectory(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> void
-abstract Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-abstract Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase file) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
 const NuGet.Commands.BuildAssetsUtils.PropsExtension = ".props" -> string
 const NuGet.Commands.BuildAssetsUtils.TargetsExtension = ".targets" -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.EnumerateFileSystemInfos() -> System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase>
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.FullName.get -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.GetDirectory(string name) -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.GetFile(string name) -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.Name.get -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.ParentDirectory.get -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper.FullName.get -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper.Name.get -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper.ParentDirectory.get -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-override Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.Equals(object obj) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.GetHashCode() -> int
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.Equals(object obj) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.GetHashCode() -> int
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.PushDirectory(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> void
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase file) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearExclude.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearInclude.Declare(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment, bool> onDeclare) -> void
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearInclude.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase file) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedExclude.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedInclude.Declare(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment, bool> onDeclare) -> void
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedInclude.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
 override NuGet.Commands.CompatibilityIssue.ToString() -> string
 override NuGet.Commands.MSBuildItem.ToString() -> string
 override NuGet.Commands.NoOpRestoreResult.CommitAsync(NuGet.Common.ILogger log, System.Threading.CancellationToken token) -> System.Threading.Tasks.Task
@@ -1022,11 +851,6 @@ override NuGet.Commands.TransitiveNoWarnUtils.NodeWarningProperties.Equals(objec
 override NuGet.Commands.TransitiveNoWarnUtils.NodeWarningProperties.GetHashCode() -> int
 override NuGet.Commands.WarningPropertiesCollection.Equals(object obj) -> bool
 override NuGet.Commands.WarningPropertiesCollection.GetHashCode() -> int
-override sealed Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.PushDirectory(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> void
-static Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult.Success(string stem) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-static Microsoft.Extensions.FileSystemGlobbing.MatcherExtensions.AddExcludePatterns(this Microsoft.Extensions.FileSystemGlobbing.Matcher matcher, params System.Collections.Generic.IEnumerable<string>[] excludePatternsGroups) -> void
-static Microsoft.Extensions.FileSystemGlobbing.MatcherExtensions.AddIncludePatterns(this Microsoft.Extensions.FileSystemGlobbing.Matcher matcher, params System.Collections.Generic.IEnumerable<string>[] includePatternsGroups) -> void
-static Microsoft.Extensions.FileSystemGlobbing.MatcherExtensions.GetResultsInFullPath(this Microsoft.Extensions.FileSystemGlobbing.Matcher matcher, string directoryPath) -> System.Collections.Generic.IEnumerable<string>
 static NuGet.Commands.AddClientCertRunner.Run(NuGet.Commands.AddClientCertArgs args, System.Func<NuGet.Common.ILogger> getLogger) -> void
 static NuGet.Commands.AddSourceRunner.Run(NuGet.Commands.AddSourceArgs args, System.Func<NuGet.Common.ILogger> getLogger) -> void
 static NuGet.Commands.AssetTargetFallbackUtility.ApplyFramework(NuGet.ProjectModel.TargetFrameworkInformation targetFrameworkInfo, System.Collections.Generic.IEnumerable<NuGet.Frameworks.NuGetFramework> packageTargetFallback, System.Collections.Generic.IEnumerable<NuGet.Frameworks.NuGetFramework> assetTargetFallback) -> void
@@ -1171,8 +995,6 @@ static NuGet.Commands.UpdateClientCertRunner.Run(NuGet.Commands.UpdateClientCert
 static NuGet.Commands.UpdateSourceRunner.Run(NuGet.Commands.UpdateSourceArgs args, System.Func<NuGet.Common.ILogger> getLogger) -> void
 static NuGet.Commands.WarningPropertiesCollection.ApplyProjectWideNoWarnProperties(NuGet.Common.ILogMessage message, NuGet.ProjectModel.WarningProperties warningProperties) -> bool
 static NuGet.Commands.WarningPropertiesCollection.ApplyProjectWideWarningsAsErrorProperties(NuGet.Common.ILogMessage message, NuGet.ProjectModel.WarningProperties warningProperties) -> void
-static readonly Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.MatchAll -> Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment
-static readonly Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult.Failed -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
 static readonly NuGet.Commands.AssetTargetFallbackUtility.AssetTargetFallback -> string
 static readonly NuGet.Commands.BuildAssetsUtils.MacroCandidates -> string[]
 static readonly NuGet.Commands.LockFileUtils.LIBANY -> string
@@ -1180,10 +1002,6 @@ static readonly NuGet.Commands.MSBuildRestoreItemGroup.ImportGroup -> string
 static readonly NuGet.Commands.MSBuildRestoreItemGroup.ItemGroup -> string
 static readonly NuGet.Commands.MSBuildRestoreUtility.Clear -> string
 static readonly NuGet.Commands.RestoreRequest.DefaultDegreeOfConcurrency -> int
-virtual Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.Declare(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment, bool> declare) -> void
-virtual Microsoft.Extensions.FileSystemGlobbing.Matcher.AddExclude(string pattern) -> Microsoft.Extensions.FileSystemGlobbing.Matcher
-virtual Microsoft.Extensions.FileSystemGlobbing.Matcher.AddInclude(string pattern) -> Microsoft.Extensions.FileSystemGlobbing.Matcher
-virtual Microsoft.Extensions.FileSystemGlobbing.Matcher.Execute(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directoryInfo) -> Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult
 virtual NuGet.Commands.DependencyGraphFileRequestProvider.CreateRequests(string inputPath, NuGet.Commands.RestoreArgs restoreContext) -> System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<NuGet.Commands.RestoreSummaryRequest>>
 virtual NuGet.Commands.DependencyGraphFileRequestProvider.Supports(string path) -> System.Threading.Tasks.Task<bool>
 virtual NuGet.Commands.RestoreResult.CommitAsync(NuGet.Common.ILogger log, System.Threading.CancellationToken token) -> System.Threading.Tasks.Task
diff --git a/src/NuGet.Core/NuGet.Commands/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/NuGet.Core/NuGet.Commands/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
index d992c703aa2..98c3204e6f0 100644
--- a/src/NuGet.Core/NuGet.Commands/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
+++ b/src/NuGet.Core/NuGet.Commands/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -1,143 +1,3 @@
-Microsoft.AspNet.FileProviders.IDirectoryContents
-Microsoft.AspNet.FileProviders.IDirectoryContents.Exists.get -> bool
-Microsoft.AspNet.FileProviders.IFileInfo
-Microsoft.AspNet.FileProviders.IFileInfo.CreateReadStream() -> System.IO.Stream
-Microsoft.AspNet.FileProviders.IFileInfo.Exists.get -> bool
-Microsoft.AspNet.FileProviders.IFileInfo.IsDirectory.get -> bool
-Microsoft.AspNet.FileProviders.IFileInfo.LastModified.get -> System.DateTimeOffset
-Microsoft.AspNet.FileProviders.IFileInfo.Length.get -> long
-Microsoft.AspNet.FileProviders.IFileInfo.Name.get -> string
-Microsoft.AspNet.FileProviders.IFileInfo.PhysicalPath.get -> string
-Microsoft.AspNet.FileProviders.IFileProvider
-Microsoft.AspNet.FileProviders.IFileProvider.GetDirectoryContents(string subpath) -> Microsoft.AspNet.FileProviders.IDirectoryContents
-Microsoft.AspNet.FileProviders.IFileProvider.GetFileInfo(string subpath) -> Microsoft.AspNet.FileProviders.IFileInfo
-Microsoft.AspNet.FileProviders.IFileProvider.Watch(string filter) -> Microsoft.Extensions.Primitives.IChangeToken
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase.DirectoryInfoBase() -> void
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.DirectoryInfoWrapper(System.IO.DirectoryInfo directoryInfo, bool isParentPath = false) -> void
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase.FileInfoBase() -> void
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper.FileInfoWrapper(System.IO.FileInfo fileInfo) -> void
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase
-Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.FileSystemInfoBase() -> void
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.Equals(Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch other) -> bool
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.FilePatternMatch(string path, string stem) -> void
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.Path.get -> string
-Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.Stem.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern.Segments.get -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern.CreatePatternContextForExclude() -> Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern.CreatePatternContextForInclude() -> Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.Declare(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment, bool> onDeclare) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.PopDirectory() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.PushDirectory(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.IPatternContext.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase file) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.Contains.get -> System.Collections.Generic.IList<System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>>
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.EndsWith.get -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.Segments.get -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern.StartsWith.get -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.MatcherContext
-Microsoft.Extensions.FileSystemGlobbing.Internal.MatcherContext.Execute() -> Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult
-Microsoft.Extensions.FileSystemGlobbing.Internal.MatcherContext.MatcherContext(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern> includePatterns, System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern> excludePatterns, Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directoryInfo, System.StringComparison comparison) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.CurrentPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.CurrentPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.CurrentPathSegment.CurrentPathSegment() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.CurrentPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.LiteralPathSegment(string value, System.StringComparison comparisonType) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.Value.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.ParentPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.ParentPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.ParentPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.ParentPathSegment.ParentPathSegment() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.RecursiveWildcardSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.RecursiveWildcardSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.RecursiveWildcardSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.RecursiveWildcardSegment.RecursiveWildcardSegment() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.BeginsWith.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.CanProduceStem.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.Contains.get -> System.Collections.Generic.List<string>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.EndsWith.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.Match(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.WildcardPathSegment(string beginsWith, System.Collections.Generic.List<string> contains, string endsWith, System.StringComparison comparisonType) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.Frame -> TFrame
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.IsStackEmpty() -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.PatternContext() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.PopDirectory() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.PushDataFrame(TFrame frame) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.CalculateStem(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase matchedFile) -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.FrameData() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.InStem -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.IsNotApplicable -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.SegmentIndex -> int
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.Stem.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.FrameData.StemItems.get -> System.Collections.Generic.IList<string>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.IsLastSegment() -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.Pattern.get -> Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.PatternContextLinear(Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.TestMatchingSegment(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearExclude
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearExclude.PatternContextLinearExclude(Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearInclude
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearInclude.PatternContextLinearInclude(Microsoft.Extensions.FileSystemGlobbing.Internal.ILinearPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.CalculateStem(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase matchedFile) -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.BacktrackAvailable -> int
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.FrameData() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.InStem -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.IsNotApplicable -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.SegmentGroup -> System.Collections.Generic.IList<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.SegmentGroupIndex -> int
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.SegmentIndex -> int
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.Stem.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.FrameData.StemItems.get -> System.Collections.Generic.IList<string>
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.IsEndingGroup() -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.IsStartingGroup() -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.Pattern.get -> Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.PatternContextRagged(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.TestMatchingGroup(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.TestMatchingSegment(string value) -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedExclude
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedExclude.PatternContextRaggedExclude(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedInclude
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedInclude.PatternContextRaggedInclude(Microsoft.Extensions.FileSystemGlobbing.Internal.IRaggedPattern pattern) -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult.IsSuccessful.get -> bool
-Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult.Stem.get -> string
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder.Build(string pattern) -> Microsoft.Extensions.FileSystemGlobbing.Internal.IPattern
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder.ComparisonType.get -> System.StringComparison
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder.PatternBuilder() -> void
-Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.PatternBuilder.PatternBuilder(System.StringComparison comparisonType) -> void
-Microsoft.Extensions.FileSystemGlobbing.Matcher
-Microsoft.Extensions.FileSystemGlobbing.Matcher.Matcher() -> void
-Microsoft.Extensions.FileSystemGlobbing.Matcher.Matcher(System.StringComparison comparisonType) -> void
-Microsoft.Extensions.FileSystemGlobbing.MatcherExtensions
-Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult
-Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult.Files.get -> System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch>
-Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult.Files.set -> void
-Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult.PatternMatchingResult(System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch> files) -> void
-Microsoft.Extensions.Primitives.IChangeToken
-Microsoft.Extensions.Primitives.IChangeToken.ActiveChangeCallbacks.get -> bool
-Microsoft.Extensions.Primitives.IChangeToken.HasChanged.get -> bool
-Microsoft.Extensions.Primitives.IChangeToken.RegisterChangeCallback(System.Action<object> callback, object state) -> System.IDisposable
 NuGet.Commands.AddClientCertArgs
 NuGet.Commands.AddClientCertArgs.AddClientCertArgs() -> void
 NuGet.Commands.AddClientCertArgs.Configfile.get -> string
@@ -966,39 +826,8 @@ NuGet.Commands.WarningPropertiesCollection.PackageSpecificWarningProperties.get
 NuGet.Commands.WarningPropertiesCollection.ProjectFrameworks.get -> System.Collections.Generic.IReadOnlyList<NuGet.Frameworks.NuGetFramework>
 NuGet.Commands.WarningPropertiesCollection.ProjectWideWarningProperties.get -> NuGet.ProjectModel.WarningProperties
 NuGet.Commands.WarningPropertiesCollection.WarningPropertiesCollection(NuGet.ProjectModel.WarningProperties projectWideWarningProperties, NuGet.Commands.PackageSpecificWarningProperties packageSpecificWarningProperties, System.Collections.Generic.IReadOnlyList<NuGet.Frameworks.NuGetFramework> projectFrameworks) -> void
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase.EnumerateFileSystemInfos() -> System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase>
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase.GetDirectory(string path) -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase.GetFile(string path) -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.FullName.get -> string
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.Name.get -> string
-abstract Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase.ParentDirectory.get -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-abstract Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.PushDirectory(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> void
-abstract Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-abstract Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase file) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
 const NuGet.Commands.BuildAssetsUtils.PropsExtension = ".props" -> string
 const NuGet.Commands.BuildAssetsUtils.TargetsExtension = ".targets" -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.EnumerateFileSystemInfos() -> System.Collections.Generic.IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase>
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.FullName.get -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.GetDirectory(string name) -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.GetFile(string name) -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.Name.get -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoWrapper.ParentDirectory.get -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper.FullName.get -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper.Name.get -> string
-override Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoWrapper.ParentDirectory.get -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase
-override Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.Equals(object obj) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.FilePatternMatch.GetHashCode() -> int
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.Equals(object obj) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.LiteralPathSegment.GetHashCode() -> int
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.PushDirectory(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> void
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinear.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase file) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearExclude.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearInclude.Declare(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment, bool> onDeclare) -> void
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextLinearInclude.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase file) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedExclude.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedInclude.Declare(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment, bool> onDeclare) -> void
-override Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRaggedInclude.Test(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> bool
 override NuGet.Commands.CompatibilityIssue.ToString() -> string
 override NuGet.Commands.MSBuildItem.ToString() -> string
 override NuGet.Commands.NoOpRestoreResult.CommitAsync(NuGet.Common.ILogger log, System.Threading.CancellationToken token) -> System.Threading.Tasks.Task
@@ -1021,11 +850,6 @@ override NuGet.Commands.TransitiveNoWarnUtils.NodeWarningProperties.Equals(objec
 override NuGet.Commands.TransitiveNoWarnUtils.NodeWarningProperties.GetHashCode() -> int
 override NuGet.Commands.WarningPropertiesCollection.Equals(object obj) -> bool
 override NuGet.Commands.WarningPropertiesCollection.GetHashCode() -> int
-override sealed Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContextRagged.PushDirectory(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directory) -> void
-static Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult.Success(string stem) -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
-static Microsoft.Extensions.FileSystemGlobbing.MatcherExtensions.AddExcludePatterns(this Microsoft.Extensions.FileSystemGlobbing.Matcher matcher, params System.Collections.Generic.IEnumerable<string>[] excludePatternsGroups) -> void
-static Microsoft.Extensions.FileSystemGlobbing.MatcherExtensions.AddIncludePatterns(this Microsoft.Extensions.FileSystemGlobbing.Matcher matcher, params System.Collections.Generic.IEnumerable<string>[] includePatternsGroups) -> void
-static Microsoft.Extensions.FileSystemGlobbing.MatcherExtensions.GetResultsInFullPath(this Microsoft.Extensions.FileSystemGlobbing.Matcher matcher, string directoryPath) -> System.Collections.Generic.IEnumerable<string>
 static NuGet.Commands.AddClientCertRunner.Run(NuGet.Commands.AddClientCertArgs args, System.Func<NuGet.Common.ILogger> getLogger) -> void
 static NuGet.Commands.AddSourceRunner.Run(NuGet.Commands.AddSourceArgs args, System.Func<NuGet.Common.ILogger> getLogger) -> void
 static NuGet.Commands.AssetTargetFallbackUtility.ApplyFramework(NuGet.ProjectModel.TargetFrameworkInformation targetFrameworkInfo, System.Collections.Generic.IEnumerable<NuGet.Frameworks.NuGetFramework> packageTargetFallback, System.Collections.Generic.IEnumerable<NuGet.Frameworks.NuGetFramework> assetTargetFallback) -> void
@@ -1170,8 +994,6 @@ static NuGet.Commands.UpdateClientCertRunner.Run(NuGet.Commands.UpdateClientCert
 static NuGet.Commands.UpdateSourceRunner.Run(NuGet.Commands.UpdateSourceArgs args, System.Func<NuGet.Common.ILogger> getLogger) -> void
 static NuGet.Commands.WarningPropertiesCollection.ApplyProjectWideNoWarnProperties(NuGet.Common.ILogMessage message, NuGet.ProjectModel.WarningProperties warningProperties) -> bool
 static NuGet.Commands.WarningPropertiesCollection.ApplyProjectWideWarningsAsErrorProperties(NuGet.Common.ILogMessage message, NuGet.ProjectModel.WarningProperties warningProperties) -> void
-static readonly Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment.MatchAll -> Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.WildcardPathSegment
-static readonly Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult.Failed -> Microsoft.Extensions.FileSystemGlobbing.Internal.PatternTestResult
 static readonly NuGet.Commands.AssetTargetFallbackUtility.AssetTargetFallback -> string
 static readonly NuGet.Commands.BuildAssetsUtils.MacroCandidates -> string[]
 static readonly NuGet.Commands.LockFileUtils.LIBANY -> string
@@ -1179,10 +1001,6 @@ static readonly NuGet.Commands.MSBuildRestoreItemGroup.ImportGroup -> string
 static readonly NuGet.Commands.MSBuildRestoreItemGroup.ItemGroup -> string
 static readonly NuGet.Commands.MSBuildRestoreUtility.Clear -> string
 static readonly NuGet.Commands.RestoreRequest.DefaultDegreeOfConcurrency -> int
-virtual Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.PatternContext<TFrame>.Declare(System.Action<Microsoft.Extensions.FileSystemGlobbing.Internal.IPathSegment, bool> declare) -> void
-virtual Microsoft.Extensions.FileSystemGlobbing.Matcher.AddExclude(string pattern) -> Microsoft.Extensions.FileSystemGlobbing.Matcher
-virtual Microsoft.Extensions.FileSystemGlobbing.Matcher.AddInclude(string pattern) -> Microsoft.Extensions.FileSystemGlobbing.Matcher
-virtual Microsoft.Extensions.FileSystemGlobbing.Matcher.Execute(Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase directoryInfo) -> Microsoft.Extensions.FileSystemGlobbing.PatternMatchingResult
 virtual NuGet.Commands.DependencyGraphFileRequestProvider.CreateRequests(string inputPath, NuGet.Commands.RestoreArgs restoreContext) -> System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<NuGet.Commands.RestoreSummaryRequest>>
 virtual NuGet.Commands.DependencyGraphFileRequestProvider.Supports(string path) -> System.Threading.Tasks.Task<bool>
 virtual NuGet.Commands.RestoreResult.CommitAsync(NuGet.Common.ILogger log, System.Threading.CancellationToken token) -> System.Threading.Tasks.Task
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/FileProviderGlobbingDirectory.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/FileProviderGlobbingDirectory.cs
index 5cbaac54b4b..69d16121c49 100644
--- a/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/FileProviderGlobbingDirectory.cs
+++ b/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/FileProviderGlobbingDirectory.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.FileProviders;
+using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
 
 // This file is based on
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/FileProviderGlobbingFile.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/FileProviderGlobbingFile.cs
index 68da622aa95..02d677afc94 100644
--- a/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/FileProviderGlobbingFile.cs
+++ b/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/FileProviderGlobbingFile.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.FileProviders;
+using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
 
 // This file is based on
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/VirtualFileInfo.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/VirtualFileInfo.cs
index 7953967ebb0..ef9ace1c72a 100644
--- a/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/VirtualFileInfo.cs
+++ b/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/VirtualFileInfo.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using System.Linq;
-using Microsoft.AspNet.FileProviders;
+using Microsoft.Extensions.FileProviders;
 
 namespace NuGet.Commands
 {
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/VirtualFileProvider.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/VirtualFileProvider.cs
index 1683f0042ad..5e67f7cc539 100644
--- a/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/VirtualFileProvider.cs
+++ b/src/NuGet.Core/NuGet.Commands/RestoreCommand/ContentFiles/VirtualFileProvider.cs
@@ -2,9 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.FileProviders;
+using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Primitives;
 
 namespace NuGet.Commands
@@ -77,7 +78,23 @@ public IFileInfo GetFileInfo(string subpath)
 
         public IChangeToken Watch(string filter)
         {
-            return NoopChangeToken.Singleton;
+            return NullChangeToken.Singleton;
+        }
+
+        private class EnumerableDirectoryContents : IDirectoryContents
+        {
+            private readonly IEnumerable<IFileInfo> _entries;
+
+            public EnumerableDirectoryContents(IEnumerable<IFileInfo> entries)
+            {
+                _entries = entries ?? throw new ArgumentNullException(nameof(entries));
+            }
+
+            public bool Exists => true;
+
+            public IEnumerator<IFileInfo> GetEnumerator() => _entries.GetEnumerator();
+
+            IEnumerator IEnumerable.GetEnumerator() => _entries.GetEnumerator();
         }
     }
 }
diff --git a/submodules/Common b/submodules/Common
deleted file mode 160000
index e6fac806168..00000000000
--- a/submodules/Common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e6fac8061686c18531e2621ccef97dd5e0687a65
diff --git a/submodules/FileSystem b/submodules/FileSystem
deleted file mode 160000
index f1f3f0820a5..00000000000
--- a/submodules/FileSystem
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f1f3f0820a573b96b2faaf5b7e6be9a036e4c7aa
diff --git a/test/TestUtilities/Test.Utility/TestDotnetCLiUtility.cs b/test/TestUtilities/Test.Utility/TestDotnetCLiUtility.cs
index 7b9d9353b73..c18a5aaadfb 100644
--- a/test/TestUtilities/Test.Utility/TestDotnetCLiUtility.cs
+++ b/test/TestUtilities/Test.Utility/TestDotnetCLiUtility.cs
@@ -233,6 +233,24 @@ private static void CopyRestoreArtifacts(string artifactsDirectory, string pathT
                 sourceFileName: typeof(Newtonsoft.Json.JsonSerializer).Assembly.Location,
                 destFileName: Path.Combine(pathToSdkInCli, "Newtonsoft.Json.dll"),
                 overwrite: true);
+
+            // Copy Microsoft.Extensions.FileSystemGlobbing.Abstractions.dll to the test folder as its a runtime dependency
+            File.Copy(
+                sourceFileName: typeof(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase).Assembly.Location,
+                destFileName: Path.Combine(pathToSdkInCli, Path.GetFileName(typeof(Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileInfoBase).Assembly.Location)),
+                overwrite: true);
+
+            // Copy Microsoft.Extensions.FileProviders.dll to the test folder as its a runtime dependency
+            File.Copy(
+                sourceFileName: typeof(Microsoft.Extensions.FileProviders.IFileInfo).Assembly.Location,
+                destFileName: Path.Combine(pathToSdkInCli, Path.GetFileName(typeof(Microsoft.Extensions.FileProviders.IFileInfo).Assembly.Location)),
+                overwrite: true);
+
+            // Copy Microsoft.Extensions.Primitives.dll to the test folder as its a runtime dependency
+            File.Copy(
+                sourceFileName: typeof(Microsoft.Extensions.Primitives.IChangeToken).Assembly.Location,
+                destFileName: Path.Combine(pathToSdkInCli, Path.GetFileName(typeof(Microsoft.Extensions.Primitives.IChangeToken).Assembly.Location)),
+                overwrite: true);
         }
 
         private static string GetTfmToCopy(string projectArtifactsBinFolder)
@@ -289,7 +307,7 @@ private static void CopyPackSdkArtifacts(string artifactsDirectory, string pathT
                 {
                     File.Copy(sourceFileName: Path.Combine(packProjectCoreArtifactsDirectory.FullName, "ilmerge", packFileName),
                         destFileName: Path.Combine(packAssemblyDestinationDirectory, packFileName),
-                        overwrite:true);
+                        overwrite: true);
                 }
             }
             else