NuGet package dependencies fixed. (#797)

microsoft · Mar 15, 2021 · 7ca64ac · 7ca64ac
1 parent d4ec238
commit 7ca64ac
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 184 deletions.
diff --git 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
@@ -16,6 +16,11 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
     </TestAdapterContent>
+    <TestAdapterContent Include="$(MSBuildThisFileDirectory)\Microsoft.TestPlatform.AdapterUtilities.dll">
+      <Link>Microsoft.TestPlatform.AdapterUtilities.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </TestAdapterContent>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Adapter/Build/NetCore/MSTest.TestAdapter.props b/src/Adapter/Build/NetCore/MSTest.TestAdapter.props
@@ -16,6 +16,11 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
     </TestAdapterContent>
+    <TestAdapterContent Include="$(MSBuildThisFileDirectory)\Microsoft.TestPlatform.AdapterUtilities.dll">
+      <Link>Microsoft.TestPlatform.AdapterUtilities.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </TestAdapterContent>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Adapter/Build/Universal/MSTest.TestAdapter.props b/src/Adapter/Build/Universal/MSTest.TestAdapter.props
@@ -16,6 +16,11 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
     </TestAdapterContent>
+    <TestAdapterContent Include="$(MSBuildThisFileDirectory)\Microsoft.TestPlatform.AdapterUtilities.dll">
+      <Link>Microsoft.TestPlatform.AdapterUtilities.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </TestAdapterContent>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj b/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj
@@ -78,8 +78,5 @@
     <ProjectReference Include="..\..\TestFramework\MSTest.Core\MSTest.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Extensions\" />
-  </ItemGroup>
   <Import Project="$(TestFxRoot)scripts\build\TestFx.targets" />
 </Project>
diff --git a/src/Package/MSTest.TestAdapter.Enu.nuspec b/src/Package/MSTest.TestAdapter.Enu.nuspec
@@ -8,12 +8,12 @@
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <description>
-  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)
     </description>
     <projectUrl>https://github.com/microsoft/testfx</projectUrl>
     <license type="file">LICENSE</license>
@@ -24,17 +24,17 @@
     <dependencies>
       <group targetFramework="netcoreapp1.0">
         <dependency id="NETStandard.Library" version="1.6.1" />
-        <dependency id="Microsoft.TestPlatform.AdapterUtilities" version="$TestPlatformVersion$" />
         <dependency id="System.Diagnostics.TextWriterTraceListener" version="4.3.0" />
       </group>
-
-      <group targetFramework="net45">
-        <dependency id="Microsoft.TestPlatform.AdapterUtilities" version="$TestPlatformVersion$" />
+
+      <group targetFramework="netstandard1.5">
+        <dependency id="NETStandard.Library" version="1.6.1" />
+        <dependency id="System.Diagnostics.TextWriterTraceListener" version="4.3.0" />
       </group>
 
-      <group targetFramework="uap10.0">
-        <dependency id="Microsoft.TestPlatform.AdapterUtilities" version="$TestPlatformVersion$" />
-      </group>
+      <group targetFramework="net45" />
+
+      <group targetFramework="uap10.0" />
     </dependencies>
   </metadata>
   <files>
@@ -43,11 +43,17 @@
     <file src="PlatformServices.Desktop\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\_common\" />
     <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\_common\" />
 
-    <!-- NetCore -->
+    <!-- netcoreapp1.0 -->
     <file src="Build\NetCore\MSTest.TestAdapter.props" target="build\netcoreapp1.0\" />
     <file src="PlatformServices.NetCore\netstandard1.5\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netcoreapp1.0\" />
     <file src="Microsoft.TestPlatform.AdapterUtilities\netstandard1.0\" target="build\netcoreapp1.0\" />
 
+
+    <!-- netstandard1.5 -->
+    <file src="Build\NetCore\MSTest.TestAdapter.props" target="build\netstandard1.5\" />
+    <file src="PlatformServices.NetCore\netstandard1.5\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netstandard1.5\" />
+    <file src="Microsoft.TestPlatform.AdapterUtilities\netstandard1.0\" target="build\netstandard1.5\" />
+
     <!-- UWP -->
     <file src="Build\Universal\MSTest.TestAdapter.props" target="build\uap10.0\MSTest.TestAdapter.props" />
     <file src="Build\Universal\MSTest.TestAdapter.targets" target="build\uap10.0\MSTest.TestAdapter.targets" />

diff --git a/src/Package/MSTest.TestAdapter.nuspec b/src/Package/MSTest.TestAdapter.nuspec
@@ -20,8 +20,21 @@
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</tags>
+
     <dependencies>
-        <dependency id="Microsoft.TestPlatform.AdapterUtilities" version="$TestPlatformVersion$" />
+      <group targetFramework="netcoreapp1.0">
+        <dependency id="NETStandard.Library" version="1.6.1" />
+        <dependency id="System.Diagnostics.TextWriterTraceListener" version="4.3.0" />
+      </group>
+
+      <group targetFramework="netstandard1.5">
+        <dependency id="NETStandard.Library" version="1.6.1" />
+        <dependency id="System.Diagnostics.TextWriterTraceListener" version="4.3.0" />
+      </group>
+
+      <group targetFramework="net45" />
+
+      <group targetFramework="uap10.0" />
     </dependencies>
   </metadata>
   <files>
@@ -30,78 +43,32 @@
     <file src="PlatformServices.Desktop\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\_common\" />
     <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\_common\" />
 
-    <file src="MSTest.CoreAdapter\zh-Hans\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll" target="\build\_common\zh-Hans" />
-    <file src="MSTest.CoreAdapter\zh-Hant\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll" target="\build\_common\zh-Hant" />
-    <file src="MSTest.CoreAdapter\cs\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll" target="\build\_common\cs" />
-    <file src="MSTest.CoreAdapter\de\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll" target="\build\_common\de" />
-    <file src="MSTest.CoreAdapter\es\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll" target="\build\_common\es" />
-    <file src="MSTest.CoreAdapter\fr\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll" target="\build\_common\fr" />
-    <file src="MSTest.CoreAdapter\it\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll" target="\build\_common\it" />
-    <file src="MSTest.CoreAdapter\ja\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll" target="\build\_common\ja" />
-    <file src="MSTest.CoreAdapter\ko\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll" target="\build\_common\ko" />
-    <file src="MSTest.CoreAdapter\pl\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll" target="\build\_common\pl" />
-    <file src="MSTest.CoreAdapter\pt-BR\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll" target="\build\_common\pt" />
-    <file src="MSTest.CoreAdapter\ru\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll" target="\build\_common\ru" />
-    <file src="MSTest.CoreAdapter\tr\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll" target="\build\_common\tr" />
-
-    <file src="PlatformServices.Desktop\zh-Hans\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\_common\zh-Hans" />
-    <file src="PlatformServices.Desktop\zh-Hant\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\_common\zh-Hant" />
-    <file src="PlatformServices.Desktop\cs\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\_common\cs" />
-    <file src="PlatformServices.Desktop\de\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\_common\de" />
-    <file src="PlatformServices.Desktop\es\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\_common\es" />
-    <file src="PlatformServices.Desktop\fr\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\_common\fr" />
-    <file src="PlatformServices.Desktop\it\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\_common\it" />
-    <file src="PlatformServices.Desktop\ja\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\_common\ja" />
-    <file src="PlatformServices.Desktop\ko\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\_common\ko" />
-    <file src="PlatformServices.Desktop\pl\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\_common\pl" />
-    <file src="PlatformServices.Desktop\pt-BR\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\_common\pt" />
-    <file src="PlatformServices.Desktop\ru\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\_common\ru" />
-    <file src="PlatformServices.Desktop\tr\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\_common\tr" />
-
-    <file src="MSTest.Core\zh-Hans\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\zh-Hans" />
-    <file src="MSTest.Core\zh-Hant\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\zh-Hant" />
-    <file src="MSTest.Core\cs\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\cs" />
-    <file src="MSTest.Core\de\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\de" />
-    <file src="MSTest.Core\es\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\es" />
-    <file src="MSTest.Core\fr\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\fr" />
-    <file src="MSTest.Core\it\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\it" />
-    <file src="MSTest.Core\ja\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\ja" />
-    <file src="MSTest.Core\ko\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\ko" />
-    <file src="MSTest.Core\pl\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\pl" />
-    <file src="MSTest.Core\pt-BR\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\pt" />
-    <file src="MSTest.Core\ru\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\ru" />
-    <file src="MSTest.Core\tr\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\tr" />
-
-    <!-- NetCore -->
+    <!-- netcoreapp1.0 -->
     <file src="Build\NetCore\MSTest.TestAdapter.props" target="build\netcoreapp1.0\" />
     <file src="PlatformServices.NetCore\netstandard1.5\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netcoreapp1.0\" />
     <file src="Microsoft.TestPlatform.AdapterUtilities\netstandard1.0\" target="build\netcoreapp1.0\" />
 
-    <!-- <file src="PlatformServices.NetCore\netstandard1.5\zh-Hans\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\netcoreapp1.0\zh-Hans" />
-    <file src="PlatformServices.NetCore\netstandard1.5\zh-Hant\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\netcoreapp1.0\zh-Hant" />
-    <file src="PlatformServices.NetCore\netstandard1.5\cs\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\netcoreapp1.0\cs" />
-    <file src="PlatformServices.NetCore\netstandard1.5\de\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\netcoreapp1.0\de" />
-    <file src="PlatformServices.NetCore\netstandard1.5\es\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\netcoreapp1.0\es" />
-    <file src="PlatformServices.NetCore\netstandard1.5\fr\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\netcoreapp1.0\fr" />
-    <file src="PlatformServices.NetCore\netstandard1.5\it\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\netcoreapp1.0\it" />
-    <file src="PlatformServices.NetCore\netstandard1.5\ja\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\netcoreapp1.0\ja" />
-    <file src="PlatformServices.NetCore\netstandard1.5\ko\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\netcoreapp1.0\ko" />
-    <file src="PlatformServices.NetCore\netstandard1.5\pl\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\netcoreapp1.0\pl" />
-    <file src="PlatformServices.NetCore\netstandard1.5\pt-BR\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\netcoreapp1.0\pt" />
-    <file src="PlatformServices.NetCore\netstandard1.5\ru\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\netcoreapp1.0\ru" />
-    <file src="PlatformServices.NetCore\netstandard1.5\tr\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll" target="\build\netcoreapp1.0\tr" /> -->
+    <!-- netstandard1.5 -->
+    <file src="Build\NetCore\MSTest.TestAdapter.props" target="build\netstandard1.5\" />
+    <file src="PlatformServices.NetCore\netstandard1.5\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netstandard1.5\" />
+    <file src="Microsoft.TestPlatform.AdapterUtilities\netstandard1.0\" target="build\netstandard1.5\" />
 
-    <!-- UWP -->
+    <!-- uap10. -->
     <file src="Build\Universal\MSTest.TestAdapter.props" target="build\uap10.0\MSTest.TestAdapter.props" />
     <file src="Build\Universal\MSTest.TestAdapter.targets" target="build\uap10.0\MSTest.TestAdapter.targets" />
     <file src="PlatformServices.Universal\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\uap10.0\" />
     <file src="Microsoft.TestPlatform.AdapterUtilities\uap10.0\" target="build\uap10.0\" />
 
-    <!-- Desktop -->
+    <!-- net45 -->
     <file src="Build\Desktop\MSTest.TestAdapter.props" target="build\net45\MSTest.TestAdapter.props" />
     <file src="Build\Desktop\MSTest.TestAdapter.targets" target="build\net45\MSTest.TestAdapter.targets" />
     <file src="Microsoft.TestPlatform.AdapterUtilities\netstandard2.0\" target="build\net45\" />
 
+    <!-- Localization -->
+    <file src="MSTest.CoreAdapter\**\*.resources.dll" target="\build\_common\" />
+    <file src="PlatformServices.Desktop\**\*.resources.dll" target="\build\_common\" />
+    <file src="MSTest.Core\**\*.resources.dll" target="build\_common\" />
+
     <!-- LICENSE -->
     <!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
     <file src="LICENS*" target="" />