diff --git a/Arcade.sln b/Arcade.sln index 1036c6ac99a..3f79659d1cc 100644 --- a/Arcade.sln +++ b/Arcade.sln @@ -129,9 +129,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Arcade.Common", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Arcade.Test.Common", "src\Common\Microsoft.Arcade.Test.Common\Microsoft.Arcade.Test.Common.csproj", "{6CA09DC9-E654-4906-A977-1279F6EDC109}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.PackageValidation", "src\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj", "{B691A17B-B577-431C-AF4D-199BBAC8EC97}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.PackageTesting", "src\Microsoft.DotNet.PackageTesting\Microsoft.DotNet.PackageTesting.csproj", "{B691A17B-B577-431C-AF4D-199BBAC8EC97}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.PackageValidation.Tests", "src\Microsoft.DotNet.PackageValidation.Tests\Microsoft.DotNet.PackageValidation.Tests.csproj", "{8BBF14AC-48F0-4282-910E-48E816021660}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.PackageTesting.Tests", "src\Microsoft.DotNet.PackageTesting.Tests\Microsoft.DotNet.PackageTesting.Tests.csproj", "{8BBF14AC-48F0-4282-910E-48E816021660}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Arcade.Common.Tests", "src\Common\Microsoft.Arcade.Common.Tests\Microsoft.Arcade.Common.Tests.csproj", "{B5E9D9D8-59E0-49F8-9C3C-75138A2D452C}" EndProject diff --git a/src/Microsoft.DotNet.PackageValidation.Tests/GetCompatibilePackageTargetFrameworksTests.cs b/src/Microsoft.DotNet.PackageTesting.Tests/GetCompatibilePackageTargetFrameworksTests.cs similarity index 98% rename from src/Microsoft.DotNet.PackageValidation.Tests/GetCompatibilePackageTargetFrameworksTests.cs rename to src/Microsoft.DotNet.PackageTesting.Tests/GetCompatibilePackageTargetFrameworksTests.cs index fa37f0ad158..10b0c3bbd42 100644 --- a/src/Microsoft.DotNet.PackageValidation.Tests/GetCompatibilePackageTargetFrameworksTests.cs +++ b/src/Microsoft.DotNet.PackageTesting.Tests/GetCompatibilePackageTargetFrameworksTests.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Xunit; -namespace Microsoft.DotNet.PackageValidation.Tests +namespace Microsoft.DotNet.PackageTesting.Tests { public class GetCompatibilePackageTargetFrameworksTests { diff --git a/src/Microsoft.DotNet.PackageValidation.Tests/Microsoft.DotNet.PackageValidation.Tests.csproj b/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj similarity index 79% rename from src/Microsoft.DotNet.PackageValidation.Tests/Microsoft.DotNet.PackageValidation.Tests.csproj rename to src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj index f69b97f4a64..21973221994 100644 --- a/src/Microsoft.DotNet.PackageValidation.Tests/Microsoft.DotNet.PackageValidation.Tests.csproj +++ b/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs b/src/Microsoft.DotNet.PackageTesting/GetCompatiblePackageTargetFrameworks.cs similarity index 99% rename from src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs rename to src/Microsoft.DotNet.PackageTesting/GetCompatiblePackageTargetFrameworks.cs index 9f877db7bc0..95c7a89efcf 100644 --- a/src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs +++ b/src/Microsoft.DotNet.PackageTesting/GetCompatiblePackageTargetFrameworks.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.DotNet.PackageValidation +namespace Microsoft.DotNet.PackageTesting { public class GetCompatiblePackageTargetFrameworks : BuildTask { diff --git a/src/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj similarity index 100% rename from src/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj rename to src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj diff --git a/src/Microsoft.DotNet.PackageValidation/NupkgParser.cs b/src/Microsoft.DotNet.PackageTesting/NupkgParser.cs similarity index 98% rename from src/Microsoft.DotNet.PackageValidation/NupkgParser.cs rename to src/Microsoft.DotNet.PackageTesting/NupkgParser.cs index ed328a8947e..fe7ad03a382 100644 --- a/src/Microsoft.DotNet.PackageValidation/NupkgParser.cs +++ b/src/Microsoft.DotNet.PackageTesting/NupkgParser.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.DotNet.PackageValidation +namespace Microsoft.DotNet.PackageTesting { public class NupkgParser { diff --git a/src/Microsoft.DotNet.PackageValidation/Package.cs b/src/Microsoft.DotNet.PackageTesting/Package.cs similarity index 95% rename from src/Microsoft.DotNet.PackageValidation/Package.cs rename to src/Microsoft.DotNet.PackageTesting/Package.cs index e4d30d724f9..1e4b7b291e9 100644 --- a/src/Microsoft.DotNet.PackageValidation/Package.cs +++ b/src/Microsoft.DotNet.PackageTesting/Package.cs @@ -5,7 +5,7 @@ using NuGet.Packaging.Core; using System.Collections.Generic; -namespace Microsoft.DotNet.PackageValidation +namespace Microsoft.DotNet.PackageTesting { public class Package { diff --git a/src/Microsoft.DotNet.PackageValidation/PackageAsset.cs b/src/Microsoft.DotNet.PackageTesting/PackageAsset.cs similarity index 94% rename from src/Microsoft.DotNet.PackageValidation/PackageAsset.cs rename to src/Microsoft.DotNet.PackageTesting/PackageAsset.cs index b5eff60fea3..825a4dad481 100644 --- a/src/Microsoft.DotNet.PackageValidation/PackageAsset.cs +++ b/src/Microsoft.DotNet.PackageTesting/PackageAsset.cs @@ -3,7 +3,7 @@ using NuGet.Frameworks; -namespace Microsoft.DotNet.PackageValidation +namespace Microsoft.DotNet.PackageTesting { public class PackageAsset { diff --git a/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props b/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props new file mode 100644 index 00000000000..052e1689aa2 --- /dev/null +++ b/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props @@ -0,0 +1,6 @@ + + + $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.PackageTesting.dll + $(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\Microsoft.DotNet.PackageTesting.dll + + diff --git a/src/Microsoft.DotNet.PackageValidation/build/Microsoft.DotNet.PackageValidation.props b/src/Microsoft.DotNet.PackageValidation/build/Microsoft.DotNet.PackageValidation.props deleted file mode 100644 index 08703d1bd38..00000000000 --- a/src/Microsoft.DotNet.PackageValidation/build/Microsoft.DotNet.PackageValidation.props +++ /dev/null @@ -1,6 +0,0 @@ - - - $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.PackageValidation.dll - $(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\Microsoft.DotNet.PackageValidation.dll - -