From 7ca64ac7be32ba31399c1bded2a4407c38dcf8f7 Mon Sep 17 00:00:00 2001
From: Medeni Baykal <433724+Haplois@users.noreply.github.com>
Date: Mon, 15 Mar 2021 23:51:57 +0100
Subject: [PATCH] NuGet package dependencies fixed. (#797)
---
TestFx.sln | 12 +-
.../Build/Desktop/MSTest.TestAdapter.props | 5 +
.../Build/NetCore/MSTest.TestAdapter.props | 5 +
.../Build/Universal/MSTest.TestAdapter.props | 5 +
.../PlatformServices.NetCore.csproj | 3 -
src/Package/MSTest.TestAdapter.Enu.nuspec | 32 +++---
src/Package/MSTest.TestAdapter.nuspec | 85 +++++---------
src/Package/MSTest.TestFramework.enu.nuspec | 15 +--
src/Package/MSTest.TestFramework.nuspec | 104 ++----------------
9 files changed, 82 insertions(+), 184 deletions(-)
diff --git a/TestFx.sln b/TestFx.sln
index 71f533abb3..5b70d8578b 100644
--- a/TestFx.sln
+++ b/TestFx.sln
@@ -67,11 +67,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Desktop", "Desktop", "{3B88
src\Adapter\Build\Desktop\MSTest.TestAdapter.targets = src\Adapter\Build\Desktop\MSTest.TestAdapter.targets
EndProjectSection
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Portable", "Portable", "{DEDA0A36-BC06-403A-BE01-EB04CA7C662C}"
- ProjectSection(SolutionItems) = preProject
- src\Adapter\Build\Portable\MSTest.TestAdapter.props = src\Adapter\Build\Portable\MSTest.TestAdapter.props
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Universal", "Universal", "{89314305-F815-4969-9B1B-8AEDE109DEC4}"
ProjectSection(SolutionItems) = preProject
src\Adapter\Build\Universal\MSTest.TestAdapter.props = src\Adapter\Build\Universal\MSTest.TestAdapter.props
@@ -187,6 +182,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TimeoutTestProjectNetCore",
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpTestProject", "test\E2ETests\TestAssets\FSharpTestProject\FSharpTestProject.fsproj", "{E5E58613-82FC-44CD-B75F-4F1C7ED52D0D}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NetCore", "NetCore", "{D11C6664-1C4E-48F0-AA92-7F5BADC6F82C}"
+ ProjectSection(SolutionItems) = preProject
+ src\Adapter\Build\NetCore\MSTest.TestAdapter.props = src\Adapter\Build\NetCore\MSTest.TestAdapter.props
+ EndProjectSection
+EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\TestFramework\Extension.Shared\Extension.Shared.projitems*{272ca5e1-8e81-4825-9e47-86cce02f700d}*SharedItemsImports = 13
@@ -1200,7 +1200,6 @@ Global
{C6F38A55-2B8E-4C5D-A49A-2D0B9D4F10C8} = {A9596292-7E67-4566-9096-143DDAA4E8D8}
{CA01DAF5-8D9D-496E-9AD3-94BB7FBB2D34} = {24088844-2107-4DB2-8F3F-CBCA94FC4B28}
{3B88BD67-C767-466D-8C9C-C14681544B84} = {CA01DAF5-8D9D-496E-9AD3-94BB7FBB2D34}
- {DEDA0A36-BC06-403A-BE01-EB04CA7C662C} = {CA01DAF5-8D9D-496E-9AD3-94BB7FBB2D34}
{89314305-F815-4969-9B1B-8AEDE109DEC4} = {CA01DAF5-8D9D-496E-9AD3-94BB7FBB2D34}
{E374A3A6-C364-4890-B315-D60F5C682B6E} = {FF8B1B72-55A1-4FFE-809E-7B79323ED8D0}
{4EA6EED3-0579-4C7C-94EA-52B2AD2A9D39} = {1A9F8CEF-7C03-40BD-B33C-1453114F9ABD}
@@ -1231,6 +1230,7 @@ Global
{26F0B8EF-92D4-4A23-ACB4-D1B662F0EEBE} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
{ED27A844-6870-4FE6-8FEF-3ABDD1ED6564} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
{E5E58613-82FC-44CD-B75F-4F1C7ED52D0D} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
+ {D11C6664-1C4E-48F0-AA92-7F5BADC6F82C} = {CA01DAF5-8D9D-496E-9AD3-94BB7FBB2D34}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {31E0F4D5-975A-41CC-933E-545B2201FAF9}
diff --git a/src/Adapter/Build/Desktop/MSTest.TestAdapter.props b/src/Adapter/Build/Desktop/MSTest.TestAdapter.props
index 54b8bc439e..c923a1eb10 100644
--- a/src/Adapter/Build/Desktop/MSTest.TestAdapter.props
+++ b/src/Adapter/Build/Desktop/MSTest.TestAdapter.props
@@ -16,6 +16,11 @@
PreserveNewest
False
+
+ Microsoft.TestPlatform.AdapterUtilities.dll
+ PreserveNewest
+ False
+
diff --git a/src/Adapter/Build/NetCore/MSTest.TestAdapter.props b/src/Adapter/Build/NetCore/MSTest.TestAdapter.props
index ba5f112fc7..aa6baccb4a 100644
--- a/src/Adapter/Build/NetCore/MSTest.TestAdapter.props
+++ b/src/Adapter/Build/NetCore/MSTest.TestAdapter.props
@@ -16,6 +16,11 @@
PreserveNewest
False
+
+ Microsoft.TestPlatform.AdapterUtilities.dll
+ PreserveNewest
+ False
+
diff --git a/src/Adapter/Build/Universal/MSTest.TestAdapter.props b/src/Adapter/Build/Universal/MSTest.TestAdapter.props
index ba5f112fc7..aa6baccb4a 100644
--- a/src/Adapter/Build/Universal/MSTest.TestAdapter.props
+++ b/src/Adapter/Build/Universal/MSTest.TestAdapter.props
@@ -16,6 +16,11 @@
PreserveNewest
False
+
+ Microsoft.TestPlatform.AdapterUtilities.dll
+ PreserveNewest
+ False
+
diff --git a/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj b/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj
index fe1ba4baa9..cedc665c7c 100644
--- a/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj
+++ b/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj
@@ -78,8 +78,5 @@
-
-
-
\ No newline at end of file
diff --git a/src/Package/MSTest.TestAdapter.Enu.nuspec b/src/Package/MSTest.TestAdapter.Enu.nuspec
index 2982e37653..a1c7728500 100644
--- a/src/Package/MSTest.TestAdapter.Enu.nuspec
+++ b/src/Package/MSTest.TestAdapter.Enu.nuspec
@@ -8,12 +8,12 @@
Microsoft
Microsoft
- The adapter to discover and execute MSTest Framework based tests.
+ The adapter to discover and execute MSTest Framework based tests.
- Supported platforms:
- - .NET 4.5.0+
- - .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017)
- - ASP.NET Core 1.0+ (Visual Studio 2017)
+ Supported platforms:
+ - .NET 4.5.0+
+ - .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017)
+ - ASP.NET Core 1.0+ (Visual Studio 2017)
https://github.com/microsoft/testfx
LICENSE
@@ -24,17 +24,17 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
@@ -43,11 +43,17 @@
-
+
+
+
+
+
+
+
diff --git a/src/Package/MSTest.TestAdapter.nuspec b/src/Package/MSTest.TestAdapter.nuspec
index a89adf275c..bcdb3f614e 100644
--- a/src/Package/MSTest.TestAdapter.nuspec
+++ b/src/Package/MSTest.TestAdapter.nuspec
@@ -20,8 +20,21 @@
http://go.microsoft.com/fwlink/?LinkID=288859
© Microsoft Corporation. All rights reserved.
MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -30,78 +43,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
-
+
-
+
+
+
+
+
+
diff --git a/src/Package/MSTest.TestFramework.enu.nuspec b/src/Package/MSTest.TestFramework.enu.nuspec
index 9ed64007c4..14e997a251 100644
--- a/src/Package/MSTest.TestFramework.enu.nuspec
+++ b/src/Package/MSTest.TestFramework.enu.nuspec
@@ -29,33 +29,28 @@
-
-
-
-
+
-
-
-
+
-
+
-
+
-
+
diff --git a/src/Package/MSTest.TestFramework.nuspec b/src/Package/MSTest.TestFramework.nuspec
index 2e54084b09..be034ab1a2 100644
--- a/src/Package/MSTest.TestFramework.nuspec
+++ b/src/Package/MSTest.TestFramework.nuspec
@@ -29,121 +29,39 @@
-
-
-
-
+
-
-
-
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+