Skip to content

Commit f566189

Browse files
jeffkljeffkl
committed
***NO_CI***
Revert "Revert "Stop using FileSystem and Common submodules (#4536)" (#4595)" This reverts commit 5ac16d7.
1 parent 9d99eb2 commit f566189

File tree

26 files changed

+85
-568
lines changed

26 files changed

+85
-568
lines changed

Diff for: ‎.gitmodules

-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
[submodule "submodules/FileSystem"]
2-
path = submodules/FileSystem
3-
url = https://github.com/NuGet/FileSystem.git
4-
branch = NuGet/SubModuleIntegration
5-
[submodule "submodules/Common"]
6-
path = submodules/Common
7-
url = https://github.com/aspnet/Common.git
8-
branch = NuGet/SubModuleIntegration
91
[submodule "submodules/NuGet.Build.Localization"]
102
path = submodules/NuGet.Build.Localization
113
url = https://github.com/NuGet/NuGet.Build.Localization.git

Diff for: ‎build/bootstrap.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PackageDownload Include="Microsoft.Web.Xdt" version="[3.0.0]" />
1919
<PackageDownload Include="Newtonsoft.Json" version="[13.0.1]" />
2020
<PackageDownload Include="NuGet.Client.EndToEnd.TestData" version="[1.0.0]" />
21-
<PackageDownload Include="NuGetValidator" version="[2.0.3]" />
21+
<PackageDownload Include="NuGetValidator" version="[2.0.5]" />
2222
</ItemGroup>
2323

2424
</Project>

Diff for: ‎build/packages.targets

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
<PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" />
3737
<PackageReference Update="Microsoft.DataAI.NuGetRecommender.Contracts" Version="2.1.0" />
3838
<PackageReference Update="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
39+
<PackageReference Update="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0"/>
40+
<PackageReference Update="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0" />
3941
<PackageReference Update="Microsoft.Internal.VisualStudio.Shell.Framework" Version="$(VSFrameworkVersion)" />
4042
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" />
4143
<PackageReference Update="Microsoft.TeamFoundationServer.ExtendedClient" Version="$(VSServicesVersion)" />
@@ -50,6 +52,7 @@
5052
<PackageReference Update="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
5153
<PackageReference Update="SharpZipLib" Version="1.3.3" />
5254
<PackageReference Update="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionPackageVersion)" />
55+
<PackageReference Update="System.Runtime.Serialization.Primitives" Version="$(SystemPackagesVersion)" />
5356
<!--
5457
The Microsoft.VisualStudio.SDK metapackage brings in System.Threading.Tasks.Dataflow 4.11.1 (assembly version 4.9.5.0).
5558
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 for: ‎eng/pipelines/templates/Build_and_UnitTest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ steps:
435435
inputs:
436436
artifactName: LocValidationLogs
437437
targetPath: "$(Build.Repository.LocalPath)\\logs\\LocalizationValidation"
438-
condition: "and(succeeded(), eq(variables['BuildRTM'], 'false'))"
438+
condition: "and(succeededOrFailed(), eq(variables['BuildRTM'], 'false'))"
439439

440440
# Use dotnet msbuild instead of MSBuild CLI.
441441
# 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 for: ‎scripts/cibuild/BuildValidator.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ param
3838

3939
if ($BuildRTM -eq 'false')
4040
{
41-
$NuGetValidator = [System.IO.Path]::Combine($RepoRoot, 'packages', 'nugetvalidator', '2.0.3', 'tools', 'NuGetValidator.exe')
41+
$NuGetValidator = [System.IO.Path]::Combine($RepoRoot, 'packages', 'nugetvalidator', '2.0.5', 'tools', 'NuGetValidator.exe')
4242
$LocalizationRepository = [System.IO.Path]::Combine($RepoRoot, 'submodules', 'NuGet.Build.Localization', 'localize', 'comments', '15')
4343

4444
if ($ValidateVsix)

Diff for: ‎setup/Microsoft.VisualStudio.NuGet.BuildTools.swr

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ folder InstallDir:\Common7\IDE\CommonExtensions\Microsoft\NuGet
88
file source=$(NuGetTargetsBasePath)NuGet.targets
99
file source=$(NuGetTargetsBasePath)NuGet.props
1010
file source=$(NuGetTargetsBasePath)NuGet.RestoreEx.targets
11+
file source=$(ReferenceOutputPath)Microsoft.Extensions.FileProviders.Abstractions.dll
12+
file source=$(ReferenceOutputPath)Microsoft.Extensions.FileSystemGlobbing.dll
13+
file source=$(ReferenceOutputPath)Microsoft.Extensions.Primitives.dll
1114
file source=$(ReferenceOutputPath)Microsoft.Web.XmlTransform.dll
1215
file source=$(ReferenceOutputPath)Microsoft.Build.NuGetSdkResolver.dll
1316
file source=$(NewtonsoftJsonPath)Newtonsoft.Json.dll

Diff for: ‎src/NuGet.Clients/NuGet.CommandLine/ilmerge.props

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0">
33
<ItemGroup>
4+
<MergeInclude Include="$(OutputPath)Microsoft.Extensions.FileProviders.Abstractions.dll"/>
5+
<MergeInclude Include="$(OutputPath)Microsoft.Extensions.FileSystemGlobbing.dll"/>
6+
<MergeInclude Include="$(OutputPath)Microsoft.Extensions.Primitives.dll"/>
47
<MergeInclude Include="$(OutputPath)Microsoft.Web.XmlTransform.dll"/>
58
<MergeInclude Include="$(OutputPath)Newtonsoft.Json.dll"/>
69
<MergeInclude Include="$(OutputPath)NuGet.Build.Tasks.dll"/>
@@ -18,11 +21,13 @@
1821
<MergeInclude Include="$(OutputPath)NuGet.Resolver.dll"/>
1922
<MergeInclude Include="$(OutputPath)NuGet.Versioning.dll"/>
2023
<MergeInclude Include="$(OutputPath)NuGet.Core.dll"/>
24+
<MergeInclude Include="$(OutputPath)System.Memory.dll"/>
2125
<MergeInclude Include="$(OutputPath)System.Threading.Tasks.Dataflow.dll"/>
2226

2327
<MergeExclude Include="$(OutputPath)Microsoft.VisualStudio.Setup.Configuration.Interop.dll"/>
2428
<MergeExclude Include="$(OutputPath)Microsoft.CSharp.dll"/>
2529
<MergeExclude Include="$(OutputPath)mscorlib.dll"/>
30+
<MergeExclude Include="$(OutputPath)System.Buffers.dll"/>
2631
<MergeExclude Include="$(OutputPath)System.Collections.Concurrent.dll"/>
2732
<MergeExclude Include="$(OutputPath)System.Collections.dll"/>
2833
<MergeExclude Include="$(OutputPath)System.ComponentModel.Composition.dll"/>
@@ -32,8 +37,10 @@
3237
<MergeExclude Include="$(OutputPath)System.IO.Compression.dll"/>
3338
<MergeExclude Include="$(OutputPath)System.Net.Http.dll"/>
3439
<MergeExclude Include="$(OutputPath)System.Net.Http.WebRequest.dll"/>
40+
<MergeExclude Include="$(OutputPath)System.Numerics.Vectors.dll"/>
3541
<MergeExclude Include="$(OutputPath)System.Runtime.dll"/>
3642
<MergeExclude Include="$(OutputPath)System.Runtime.Serialization.dll"/>
43+
<MergeExclude Include="$(OutputPath)System.Runtime.CompilerServices.Unsafe.dll"/>
3744
<MergeExclude Include="$(OutputPath)System.Security.dll"/>
3845
<MergeExclude Include="$(OutputPath)System.ServiceModel.dll"/>
3946
<MergeExclude Include="$(OutputPath)System.Xml.dll"/>

Diff for: ‎src/NuGet.Clients/NuGet.MSSigning.Extensions/ilmerge.props

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0">
33
<ItemGroup>
4+
<MergeInclude Include="$(OutputPath)Microsoft.Extensions.FileProviders.Abstractions.dll"/>
5+
<MergeInclude Include="$(OutputPath)Microsoft.Extensions.FileSystemGlobbing.dll"/>
6+
<MergeInclude Include="$(OutputPath)Microsoft.Extensions.Primitives.dll"/>
47
<MergeInclude Include="$(OutputPath)Microsoft.Web.XmlTransform.dll"/>
58
<MergeInclude Include="$(OutputPath)Newtonsoft.Json.dll"/>
69
<MergeInclude Include="$(OutputPath)NuGet.Build.Tasks.dll"/>
@@ -19,11 +22,13 @@
1922
<MergeInclude Include="$(OutputPath)NuGet.Versioning.dll"/>
2023
<MergeInclude Include="$(OutputPath)NuGet.Core.dll"/>
2124
<MergeInclude Include="$(OutputPath)NuGet.MSSigning.Extensions.dll"/>
25+
<MergeInclude Include="$(OutputPath)System.Memory.dll"/>
2226
<MergeInclude Include="$(OutputPath)System.Threading.Tasks.Dataflow.dll"/>
2327

2428
<MergeExclude Include="$(OutputPath)Microsoft.VisualStudio.Setup.Configuration.Interop.dll"/>
2529
<MergeExclude Include="$(OutputPath)Microsoft.CSharp.dll"/>
2630
<MergeExclude Include="$(OutputPath)mscorlib.dll"/>
31+
<MergeExclude Include="$(OutputPath)System.Buffers.dll"/>
2732
<MergeExclude Include="$(OutputPath)System.Collections.Concurrent.dll"/>
2833
<MergeExclude Include="$(OutputPath)System.Collections.dll"/>
2934
<MergeExclude Include="$(OutputPath)System.ComponentModel.Composition.dll"/>
@@ -33,8 +38,10 @@
3338
<MergeExclude Include="$(OutputPath)System.IO.Compression.dll"/>
3439
<MergeExclude Include="$(OutputPath)System.Net.Http.dll"/>
3540
<MergeExclude Include="$(OutputPath)System.Net.Http.WebRequest.dll"/>
41+
<MergeExclude Include="$(OutputPath)System.Numerics.Vectors.dll"/>
3642
<MergeExclude Include="$(OutputPath)System.Runtime.dll"/>
3743
<MergeExclude Include="$(OutputPath)System.Runtime.Serialization.dll"/>
44+
<MergeExclude Include="$(OutputPath)System.Runtime.CompilerServices.Unsafe.dll"/>
3845
<MergeExclude Include="$(OutputPath)System.Security.dll"/>
3946
<MergeExclude Include="$(OutputPath)System.ServiceModel.dll"/>
4047
<MergeExclude Include="$(OutputPath)System.Xml.dll"/>

Diff for: ‎src/NuGet.Clients/NuGet.SolutionRestoreManager/Properties/AssemblyInfo.cs

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
[assembly: Guid("06662133-1292-4918-90f3-36c930c0b16f")]
2222

2323
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Lucene.Net.dll")]
24+
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.FileProviders.Abstractions.dll")]
25+
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.FileSystemGlobbing.dll")]
26+
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.Primitives.dll")]
2427
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Newtonsoft.Json.dll")]
2528
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\NuGet.Commands.dll")]
2629
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\NuGet.Common.dll")]

Diff for: ‎src/NuGet.Clients/NuGet.Tools/Properties/AssemblyInfo.cs

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
[assembly: ComVisible(false)]
1212

1313
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Lucene.Net.dll")]
14+
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.FileProviders.Abstractions.dll")]
15+
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.FileSystemGlobbing.dll")]
16+
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.Primitives.dll")]
1417
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Web.XmlTransform.dll")]
1518
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Newtonsoft.Json.dll")]
1619
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\NuGet.Commands.dll")]

Diff for: ‎src/NuGet.Clients/NuGet.VisualStudio.Client/.vsixinclude

+3
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,8 @@ NuGet.Versioning.dll
3434

3535
# 3rd party dlls to keep
3636
Lucene.Net.dll
37+
Microsoft.Extensions.FileProviders.Abstractions.dll
38+
Microsoft.Extensions.FileSystemGlobbing.dll
39+
Microsoft.Extensions.Primitives.dll
3740
Microsoft.Web.XmlTransform.dll
3841
Newtonsoft.Json.dll

Diff for: ‎src/NuGet.Clients/NuGet.VisualStudio.Client/source.extension.vsixmanifest

+3
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@
6666
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="NuGet.VisualStudio.OnlineEnvironment.Client" Path="|NuGet.VisualStudio.OnlineEnvironment.Client|" />
6767

6868
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Lucene.Net.dll" AssemblyName="Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181" />
69+
<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" />
70+
<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" />
71+
<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" />
6972
<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" />
7073
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Newtonsoft.Json.dll" AssemblyName="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed" />
7174
</Assets>

Diff for: ‎src/NuGet.Clients/NuGet.VisualStudio.OnlineEnvironment.Client/Properties/AssemblyInfo.cs

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
[assembly: ComVisible(false)]
1818

1919
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Lucene.Net.dll")]
20+
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.FileProviders.Abstractions.dll")]
21+
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.FileSystemGlobbing.dll")]
22+
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Extensions.Primitives.dll")]
2023
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Web.XmlTransform.dll")]
2124
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Newtonsoft.Json.dll")]
2225
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\NuGet.Commands.dll")]

Diff for: ‎src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
/out:$(PathToMergedNuGetPack) ^
114114
$(ILMergePlatformArg) ^
115115
/lib:$(OutputPath)publish ^
116+
/allowDup ^
116117
/internalize ^
117118
/xmldocs ^
118119
/log:$(ILMergeResultDir)IlMergeLog.txt</IlmergeCommand>
@@ -153,6 +154,7 @@
153154
/out:$(PathToMergedNuGetPackResource) ^
154155
$(ILMergePlatformArg) ^
155156
/log ^
157+
/allowDup ^
156158
/lib:$(OutputPath)\publish ^
157159
/internalize ^
158160
/xmldocs ^

Diff for: ‎src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<ItemGroup>
2121
<PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="All" />
2222
<PackageReference Include="System.Diagnostics.Debug" />
23+
<PackageReference Include="System.Runtime.Serialization.Primitives" />
2324
</ItemGroup>
2425

2526
<!-- Microsoft.Build.Locator is needed when debugging, but should not be used in the assemblies we insert.

Diff for: ‎src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project>
1+
<Project>
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'NuGet.sln'))\build\common.props" />
33
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
44

@@ -22,8 +22,8 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<Compile Remove="..\..\..\submodules\FileSystem\src\**\AssemblyInfo.cs" />
26-
<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\**" />
25+
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
26+
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

0 commit comments

Comments
 (0)