From 1c136c815a6f73dbc9bf72a811d8ce3294a03981 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Fri, 21 Jun 2024 10:34:40 -0700 Subject: [PATCH 1/3] Remove NuGet.Packaging.Core --- NuGet-ApexTests.slnf | 47 ------------------- NuGet-Commandline-WithTests.slnf | 1 - NuGet-Src-Commandline.slnf | 1 - NuGet-Src.slnf | 1 - NuGet-UnitTests.slnf | 1 - NuGet.sln | 6 --- .../NuGet.Packaging.Core/AssemblyInfo.cs | 32 ------------- .../NuGet.Packaging.Core.csproj | 17 ------- src/NuGet.Core/NuGet.Packaging.Core/README.md | 1 - 9 files changed, 107 deletions(-) delete mode 100644 NuGet-ApexTests.slnf delete mode 100644 src/NuGet.Core/NuGet.Packaging.Core/AssemblyInfo.cs delete mode 100644 src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj delete mode 100644 src/NuGet.Core/NuGet.Packaging.Core/README.md diff --git a/NuGet-ApexTests.slnf b/NuGet-ApexTests.slnf deleted file mode 100644 index e03d4d8d863..00000000000 --- a/NuGet-ApexTests.slnf +++ /dev/null @@ -1,47 +0,0 @@ -{ - "solution": { - "path": "NuGet.sln", - "projects": [ - "src\\NuGet.Clients\\NuGet.CommandLine\\NuGet.CommandLine.csproj", - "src\\NuGet.Clients\\NuGet.Console\\NuGet.Console.csproj", - "src\\NuGet.Clients\\NuGet.Indexing\\NuGet.Indexing.csproj", - "src\\NuGet.Clients\\NuGet.PackageManagement.PowerShellCmdlets\\NuGet.PackageManagement.PowerShellCmdlets.csproj", - "src\\NuGet.Clients\\NuGet.PackageManagement.UI\\NuGet.PackageManagement.UI.csproj", - "src\\NuGet.Clients\\NuGet.PackageManagement.VisualStudio\\NuGet.PackageManagement.VisualStudio.csproj", - "src\\NuGet.Clients\\NuGet.SolutionRestoreManager\\NuGet.SolutionRestoreManager.csproj", - "src\\NuGet.Clients\\NuGet.Tools\\NuGet.Tools.csproj", - "src\\NuGet.Clients\\NuGet.VisualStudio.Client\\NuGet.VisualStudio.Client.csproj", - "src\\NuGet.Clients\\NuGet.VisualStudio.Common\\NuGet.VisualStudio.Common.csproj", - "src\\NuGet.Clients\\NuGet.VisualStudio.Contracts\\NuGet.VisualStudio.Contracts.csproj", - "src\\NuGet.Clients\\NuGet.VisualStudio.Implementation\\NuGet.VisualStudio.Implementation.csproj", - "src\\NuGet.Clients\\NuGet.VisualStudio.Internal.Contracts\\NuGet.VisualStudio.Internal.Contracts.csproj", - "src\\NuGet.Clients\\NuGet.VisualStudio.Interop\\NuGet.VisualStudio.Interop.csproj", - "src\\NuGet.Clients\\NuGet.VisualStudio.OnlineEnvironment.Client\\NuGet.VisualStudio.OnlineEnvironment.Client.csproj", - "src\\NuGet.Clients\\NuGet.VisualStudio\\NuGet.VisualStudio.csproj", - "src\\NuGet.Core\\Microsoft.Build.NuGetSdkResolver\\Microsoft.Build.NuGetSdkResolver.csproj", - "src\\NuGet.Core\\NuGet.Build.Tasks.Console\\NuGet.Build.Tasks.Console.csproj", - "src\\NuGet.Core\\NuGet.Build.Tasks\\NuGet.Build.Tasks.csproj", - "src\\NuGet.Core\\NuGet.Commands\\NuGet.Commands.csproj", - "src\\NuGet.Core\\NuGet.Common\\NuGet.Common.csproj", - "src\\NuGet.Core\\NuGet.Configuration\\NuGet.Configuration.csproj", - "src\\NuGet.Core\\NuGet.Credentials\\NuGet.Credentials.csproj", - "src\\NuGet.Core\\NuGet.DependencyResolver.Core\\NuGet.DependencyResolver.Core.csproj", - "src\\NuGet.Core\\NuGet.Frameworks\\NuGet.Frameworks.csproj", - "src\\NuGet.Core\\NuGet.LibraryModel\\NuGet.LibraryModel.csproj", - "src\\NuGet.Core\\NuGet.PackageManagement\\NuGet.PackageManagement.csproj", - "src\\NuGet.Core\\NuGet.Packaging.Core\\NuGet.Packaging.Core.csproj", - "src\\NuGet.Core\\NuGet.Packaging\\NuGet.Packaging.csproj", - "src\\NuGet.Core\\NuGet.ProjectModel\\NuGet.ProjectModel.csproj", - "src\\NuGet.Core\\NuGet.Protocol\\NuGet.Protocol.csproj", - "src\\NuGet.Core\\NuGet.Resolver\\NuGet.Resolver.csproj", - "src\\NuGet.Core\\NuGet.Versioning\\NuGet.Versioning.csproj", - "test\\NuGet.Tests.Apex\\NuGet.Console.TestContract\\NuGet.Console.TestContract.csproj", - "test\\NuGet.Tests.Apex\\NuGet.OptProf\\NuGet.OptProf.csproj", - "test\\NuGet.Tests.Apex\\NuGet.PackageManagement.UI.TestContract\\NuGet.PackageManagement.UI.TestContract.csproj", - "test\\NuGet.Tests.Apex\\NuGet.Tests.Apex\\NuGet.Tests.Apex.csproj", - "test\\NuGet.Tests.Apex\\NuGet.Tests.Apex.Daily\\NuGet.Tests.Apex.Daily.csproj", - "test\\TestExtensions\\NuGet.StaFact\\NuGet.StaFact.csproj", - "test\\TestUtilities\\Test.Utility\\Test.Utility.csproj" - ] - } -} \ No newline at end of file diff --git a/NuGet-Commandline-WithTests.slnf b/NuGet-Commandline-WithTests.slnf index 6be39b48551..7e79c605734 100644 --- a/NuGet-Commandline-WithTests.slnf +++ b/NuGet-Commandline-WithTests.slnf @@ -17,7 +17,6 @@ "src\\NuGet.Core\\NuGet.LibraryModel\\NuGet.LibraryModel.csproj", "src\\NuGet.Core\\NuGet.Localization\\NuGet.Localization.csproj", "src\\NuGet.Core\\NuGet.PackageManagement\\NuGet.PackageManagement.csproj", - "src\\NuGet.Core\\NuGet.Packaging.Core\\NuGet.Packaging.Core.csproj", "src\\NuGet.Core\\NuGet.Packaging\\NuGet.Packaging.csproj", "src\\NuGet.Core\\NuGet.ProjectModel\\NuGet.ProjectModel.csproj", "src\\NuGet.Core\\NuGet.Protocol\\NuGet.Protocol.csproj", diff --git a/NuGet-Src-Commandline.slnf b/NuGet-Src-Commandline.slnf index ce97a647f69..16ae724d375 100644 --- a/NuGet-Src-Commandline.slnf +++ b/NuGet-Src-Commandline.slnf @@ -17,7 +17,6 @@ "src\\NuGet.Core\\NuGet.LibraryModel\\NuGet.LibraryModel.csproj", "src\\NuGet.Core\\NuGet.Localization\\NuGet.Localization.csproj", "src\\NuGet.Core\\NuGet.PackageManagement\\NuGet.PackageManagement.csproj", - "src\\NuGet.Core\\NuGet.Packaging.Core\\NuGet.Packaging.Core.csproj", "src\\NuGet.Core\\NuGet.Packaging\\NuGet.Packaging.csproj", "src\\NuGet.Core\\NuGet.ProjectModel\\NuGet.ProjectModel.csproj", "src\\NuGet.Core\\NuGet.Protocol\\NuGet.Protocol.csproj", diff --git a/NuGet-Src.slnf b/NuGet-Src.slnf index 169df714e95..80e8d1fe3d1 100644 --- a/NuGet-Src.slnf +++ b/NuGet-Src.slnf @@ -33,7 +33,6 @@ "src\\NuGet.Core\\NuGet.LibraryModel\\NuGet.LibraryModel.csproj", "src\\NuGet.Core\\NuGet.Localization\\NuGet.Localization.csproj", "src\\NuGet.Core\\NuGet.PackageManagement\\NuGet.PackageManagement.csproj", - "src\\NuGet.Core\\NuGet.Packaging.Core\\NuGet.Packaging.Core.csproj", "src\\NuGet.Core\\NuGet.Packaging\\NuGet.Packaging.csproj", "src\\NuGet.Core\\NuGet.ProjectModel\\NuGet.ProjectModel.csproj", "src\\NuGet.Core\\NuGet.Protocol\\NuGet.Protocol.csproj", diff --git a/NuGet-UnitTests.slnf b/NuGet-UnitTests.slnf index 9d4d3e72e12..eba6e7dfe86 100644 --- a/NuGet-UnitTests.slnf +++ b/NuGet-UnitTests.slnf @@ -33,7 +33,6 @@ "src\\NuGet.Core\\NuGet.LibraryModel\\NuGet.LibraryModel.csproj", "src\\NuGet.Core\\NuGet.Localization\\NuGet.Localization.csproj", "src\\NuGet.Core\\NuGet.PackageManagement\\NuGet.PackageManagement.csproj", - "src\\NuGet.Core\\NuGet.Packaging.Core\\NuGet.Packaging.Core.csproj", "src\\NuGet.Core\\NuGet.Packaging\\NuGet.Packaging.csproj", "src\\NuGet.Core\\NuGet.ProjectModel\\NuGet.ProjectModel.csproj", "src\\NuGet.Core\\NuGet.Protocol\\NuGet.Protocol.csproj", diff --git a/NuGet.sln b/NuGet.sln index 13f3fcde141..2d44298fc73 100644 --- a/NuGet.sln +++ b/NuGet.sln @@ -236,8 +236,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.NuGetSdkRes EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.VisualStudio.Common.Test", "test\NuGet.Clients.Tests\NuGet.VisualStudio.Common.Test\NuGet.VisualStudio.Common.Test.csproj", "{1EDFC48B-2CEC-49DD-90DA-3A69BDDAB8CF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Packaging.Core", "src\NuGet.Core\NuGet.Packaging.Core\NuGet.Packaging.Core.csproj", "{02B7C422-C592-4BA6-89A7-ACBD7923B34D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Msbuild.Integration.Test", "test\NuGet.Core.FuncTests\Msbuild.Integration.Test\Msbuild.Integration.Test.csproj", "{92EF44DB-4F40-4610-A1AD-3A554A0CA8B9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Build.Tasks.Console", "src\NuGet.Core\NuGet.Build.Tasks.Console\NuGet.Build.Tasks.Console.csproj", "{3ED13630-90EB-420E-8083-0959B2955C6E}" @@ -634,10 +632,6 @@ Global {1EDFC48B-2CEC-49DD-90DA-3A69BDDAB8CF}.Debug|Any CPU.Build.0 = Debug|Any CPU {1EDFC48B-2CEC-49DD-90DA-3A69BDDAB8CF}.Release|Any CPU.ActiveCfg = Release|Any CPU {1EDFC48B-2CEC-49DD-90DA-3A69BDDAB8CF}.Release|Any CPU.Build.0 = Release|Any CPU - {02B7C422-C592-4BA6-89A7-ACBD7923B34D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {02B7C422-C592-4BA6-89A7-ACBD7923B34D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {02B7C422-C592-4BA6-89A7-ACBD7923B34D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {02B7C422-C592-4BA6-89A7-ACBD7923B34D}.Release|Any CPU.Build.0 = Release|Any CPU {92EF44DB-4F40-4610-A1AD-3A554A0CA8B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {92EF44DB-4F40-4610-A1AD-3A554A0CA8B9}.Debug|Any CPU.Build.0 = Debug|Any CPU {92EF44DB-4F40-4610-A1AD-3A554A0CA8B9}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/NuGet.Core/NuGet.Packaging.Core/AssemblyInfo.cs b/src/NuGet.Core/NuGet.Packaging.Core/AssemblyInfo.cs deleted file mode 100644 index 11c40fed77a..00000000000 --- a/src/NuGet.Core/NuGet.Packaging.Core/AssemblyInfo.cs +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Runtime.CompilerServices; -using NuGet.Packaging; -using NuGet.Packaging.Core; - -[assembly: CLSCompliant(true)] -[assembly: TypeForwardedTo(typeof(ContentFilesEntry))] -[assembly: TypeForwardedTo(typeof(ExtractPackageFileDelegate))] -[assembly: TypeForwardedTo(typeof(Fingerprints))] -[assembly: TypeForwardedTo(typeof(FrameworkSpecificGroup))] -[assembly: TypeForwardedTo(typeof(IAsyncPackageCoreReader))] -[assembly: TypeForwardedTo(typeof(INuspecCoreReader))] -[assembly: TypeForwardedTo(typeof(IPackageCoreReader))] -[assembly: TypeForwardedTo(typeof(IPackageIdentityComparer))] -[assembly: TypeForwardedTo(typeof(IRepositoryCertificateInfo))] -[assembly: TypeForwardedTo(typeof(NuspecCoreReader))] -[assembly: TypeForwardedTo(typeof(NuspecCoreReaderBase))] -[assembly: TypeForwardedTo(typeof(NuspecUtility))] -[assembly: TypeForwardedTo(typeof(PackageDependency))] -[assembly: TypeForwardedTo(typeof(PackageDependencyComparer))] -[assembly: TypeForwardedTo(typeof(PackageDependencyGroup))] -[assembly: TypeForwardedTo(typeof(PackageDependencyInfo))] -[assembly: TypeForwardedTo(typeof(PackageDependencyInfoComparer))] -[assembly: TypeForwardedTo(typeof(PackageIdentity))] -[assembly: TypeForwardedTo(typeof(PackageIdentityComparer))] -[assembly: TypeForwardedTo(typeof(PackageType))] -[assembly: TypeForwardedTo(typeof(PackagingCoreConstants))] -[assembly: TypeForwardedTo(typeof(PackagingException))] -[assembly: TypeForwardedTo(typeof(RepositoryMetadata))] diff --git a/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj b/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj deleted file mode 100644 index 2bf321f63c2..00000000000 --- a/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - The (former home to) core data structures for NuGet.Packaging. Contains only the type forwarders to the new assembly. - $(TargetFrameworksLibraryForSigning) - - $(NoWarn);CS1591 - true - true - true - true - false - - - - - - diff --git a/src/NuGet.Core/NuGet.Packaging.Core/README.md b/src/NuGet.Core/NuGet.Packaging.Core/README.md deleted file mode 100644 index 628747e2002..00000000000 --- a/src/NuGet.Core/NuGet.Packaging.Core/README.md +++ /dev/null @@ -1 +0,0 @@ -The (former home to) core data structures for NuGet.Packaging. Contains only the type forwarders to the new assembly. From 5d4c0de9bc9bd28f191230ef0b11e7718d2d2941 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Fri, 21 Jun 2024 13:03:28 -0700 Subject: [PATCH 2/3] Fix sln file --- NuGet.sln | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NuGet.sln b/NuGet.sln index 2d44298fc73..9ad2ae6a035 100644 --- a/NuGet.sln +++ b/NuGet.sln @@ -301,8 +301,8 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet-build", "dotnet-build", "{85D69893-216B-4D97-9E90-39340CA24CA4}" ProjectSection(SolutionItems) = preProject eng\dotnet-build\build.sh = eng\dotnet-build\build.sh - eng\dotnet-build\global.json = eng\dotnet-build\global.json eng\dotnet-build\dotnet-build.proj = eng\dotnet-build\dotnet-build.proj + eng\dotnet-build\global.json = eng\dotnet-build\global.json EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{EA5A2D72-33C8-442C-AB6D-99EA8739591D}" @@ -799,7 +799,6 @@ Global {299B3E44-5372-4D6B-A4E9-3DBEA4705701} = {506AF844-92E0-4404-BBFC-0AB073890A72} {ADCF5BF7-5A77-4F0E-AE76-96C611A079D8} = {7323F93B-D141-4001-BB9E-7AF14031143E} {1EDFC48B-2CEC-49DD-90DA-3A69BDDAB8CF} = {01BC4531-1E25-48D7-A8FD-A47D6FEC47FB} - {02B7C422-C592-4BA6-89A7-ACBD7923B34D} = {506AF844-92E0-4404-BBFC-0AB073890A72} {92EF44DB-4F40-4610-A1AD-3A554A0CA8B9} = {BB63CACA-866F-454F-BA4C-78B788D032BB} {3ED13630-90EB-420E-8083-0959B2955C6E} = {506AF844-92E0-4404-BBFC-0AB073890A72} {2011B5A4-2184-4F94-9897-E5BC2425DCDA} = {7323F93B-D141-4001-BB9E-7AF14031143E} From 6ff7edd7a5730fc7d47f027addc3f302d2a0c178 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Fri, 21 Jun 2024 16:20:52 -0700 Subject: [PATCH 3/3] Fix up script --- scripts/utils/EnsureAllPackagesExist.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/utils/EnsureAllPackagesExist.ps1 b/scripts/utils/EnsureAllPackagesExist.ps1 index e55dcd4f28b..9ec028e59df 100644 --- a/scripts/utils/EnsureAllPackagesExist.ps1 +++ b/scripts/utils/EnsureAllPackagesExist.ps1 @@ -26,7 +26,6 @@ Param ( "NuGet.LibraryModel", "NuGet.Localization", "NuGet.PackageManagement", -"NuGet.Packaging.Core", "NuGet.Packaging", "NuGet.ProjectModel", "NuGet.Protocol",