From 32f53aea32c4aac68a8880ec74ee84de56fcdf12 Mon Sep 17 00:00:00 2001
From: Medeni Baykal <433724+Haplois@users.noreply.github.com>
Date: Mon, 1 Mar 2021 18:11:17 +0100
Subject: [PATCH] Fixed nuget packages. (#787)

---
 scripts/Build.ps1                            |  4 +--
 src/Package/MSTest.TestAdapter.Dotnet.nuspec | 32 --------------------
 src/Package/MSTest.TestAdapter.Enu.nuspec    |  2 +-
 src/Package/MSTest.TestAdapter.nuspec        |  2 +-
 src/Package/MSTest.TestFramework.enu.nuspec  |  6 ++--
 src/Package/MSTest.TestFramework.nuspec      |  6 ++--
 6 files changed, 10 insertions(+), 42 deletions(-)
 delete mode 100644 src/Package/MSTest.TestAdapter.Dotnet.nuspec

diff --git a/scripts/Build.ps1 b/scripts/Build.ps1
index 0c499937d3..618ab1f4d3 100644
--- a/scripts/Build.ps1
+++ b/scripts/Build.ps1
@@ -249,10 +249,10 @@ function Create-NugetPackages {
 
   # Copy over the nuspecs to the staging directory
   if ($TFB_Official) {
-    $nuspecFiles = @("MSTest.TestAdapter.Dotnet.nuspec", "MSTest.TestAdapter.nuspec", "MSTest.TestAdapter.symbols.nuspec", "MSTest.TestFramework.nuspec", "MSTest.TestFramework.symbols.nuspec", "MSTest.Internal.TestFx.Documentation.nuspec")
+    $nuspecFiles = @("MSTest.TestAdapter.nuspec", "MSTest.TestAdapter.symbols.nuspec", "MSTest.TestFramework.nuspec", "MSTest.TestFramework.symbols.nuspec", "MSTest.Internal.TestFx.Documentation.nuspec")
   }
   else {
-    $nuspecFiles = @("MSTest.TestAdapter.Enu.nuspec", "MSTest.TestFramework.enu.nuspec", "MSTest.TestAdapter.Dotnet.nuspec")
+    $nuspecFiles = @("MSTest.TestAdapter.Enu.nuspec", "MSTest.TestFramework.enu.nuspec")
   }
 
   foreach ($file in $nuspecFiles) {
diff --git a/src/Package/MSTest.TestAdapter.Dotnet.nuspec b/src/Package/MSTest.TestAdapter.Dotnet.nuspec
deleted file mode 100644
index d33731c5df..0000000000
--- a/src/Package/MSTest.TestAdapter.Dotnet.nuspec
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>MSTest.TestAdapter.Dotnet</id>
-    <version>1.1.10-rc2</version>
-    <title>MSTest.TestAdapter.Dotnet</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>A nuget package targeting running MSTest tests on Dotnet vnext projects.</description>
-    <projectUrl>https://github.com/microsoft/testfx</projectUrl>
-    <license type="file">LICENSE</license>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-  </metadata>
-  <files>	
-	  <file src="MSTest.CoreAdapter\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="lib\dotnet\" />
-    <file src="PlatformServices.Interface\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll" target="lib\dotnet\" />
-	  <file src="PlatformServices.Portable\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="lib\dotnet\" />
-	
-	  <file src="MSTest.CoreAdapter\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="lib\net451\" />
-    <file src="PlatformServices.Interface\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll" target="lib\net451\" />
-	  <file src="PlatformServices.Desktop\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="lib\net451\" />
-	  
-    <!-- Added the below so source navigation works in dotnet-test scenarios -->
-	  <file src="$packagesroot$\Microsoft.Internal.Dia.Interop.14.0.0\lib\net20\msdia140typelib_clr0200.dll" target="lib\net451\" />
-
-    <!-- LICENSE -->
-    <!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
-    <file src="LICENS*" target="" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/src/Package/MSTest.TestAdapter.Enu.nuspec b/src/Package/MSTest.TestAdapter.Enu.nuspec
index 9295e19211..03e0416cc1 100644
--- a/src/Package/MSTest.TestAdapter.Enu.nuspec
+++ b/src/Package/MSTest.TestAdapter.Enu.nuspec
@@ -24,7 +24,7 @@
     <dependencies>
       <group targetFramework="netcoreapp1.0">
         <dependency id="NETStandard.Library" version="1.6.1" />
-        <dependency id="Microsoft.TestPlatform.AdapterUtilities" />
+        <dependency id="Microsoft.TestPlatform.AdapterUtilities" version="[16.9.1, )" />
         <dependency id="System.Diagnostics.TextWriterTraceListener" version="4.3.0" />
       </group>
 
diff --git a/src/Package/MSTest.TestAdapter.nuspec b/src/Package/MSTest.TestAdapter.nuspec
index 17656fa26e..f639e0599b 100644
--- a/src/Package/MSTest.TestAdapter.nuspec
+++ b/src/Package/MSTest.TestAdapter.nuspec
@@ -21,7 +21,7 @@
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</tags>
     <dependencies>
-      <dependency id="Microsoft.TestPlatform.AdapterUtilities" />
+        <dependency id="Microsoft.TestPlatform.AdapterUtilities" version="[16.9.1, )" />
     </dependencies>
   </metadata>
   <files>
diff --git a/src/Package/MSTest.TestFramework.enu.nuspec b/src/Package/MSTest.TestFramework.enu.nuspec
index 91e175d7ca..8b0aa95e2c 100644
--- a/src/Package/MSTest.TestFramework.enu.nuspec
+++ b/src/Package/MSTest.TestFramework.enu.nuspec
@@ -29,16 +29,16 @@
     <dependencies>
       <group targetFramework="netstandard1.0">
         <dependency id="NETStandard.Library" version="1.6.1" />
-        <dependency id="Microsoft.TestPlatform.AdapterUtilities" />
+        <dependency id="Microsoft.TestPlatform.AdapterUtilities" version="[16.9.1, )" />
         <dependency id="System.Diagnostics.TextWriterTraceListener" version="4.3.0" />
       </group>
 
       <group targetFramework="net45">
-        <dependency id="Microsoft.TestPlatform.AdapterUtilities" />
+        <dependency id="Microsoft.TestPlatform.AdapterUtilities" version="[16.9.1, )" />
       </group>
 
       <group targetFramework="uap10.0">
-        <dependency id="Microsoft.TestPlatform.AdapterUtilities" />
+        <dependency id="Microsoft.TestPlatform.AdapterUtilities" version="[16.9.1, )" />
       </group>
     </dependencies>
   </metadata>
diff --git a/src/Package/MSTest.TestFramework.nuspec b/src/Package/MSTest.TestFramework.nuspec
index bb29c42f5f..2e54084b09 100644
--- a/src/Package/MSTest.TestFramework.nuspec
+++ b/src/Package/MSTest.TestFramework.nuspec
@@ -29,16 +29,16 @@
     <dependencies>
       <group targetFramework="netstandard1.0">
         <dependency id="NETStandard.Library" version="1.6.1" />
-        <dependency id="Microsoft.TestPlatform.AdapterUtilities" />
+        <dependency id="Microsoft.TestPlatform.AdapterUtilities" version="[16.9.1, )" />
         <dependency id="System.Diagnostics.TextWriterTraceListener" version="4.3.0" />
       </group>
 
       <group targetFramework="net45">
-        <dependency id="Microsoft.TestPlatform.AdapterUtilities" />
+        <dependency id="Microsoft.TestPlatform.AdapterUtilities" version="[16.9.1, )" />
       </group>
 
       <group targetFramework="uap10.0">
-        <dependency id="Microsoft.TestPlatform.AdapterUtilities" />
+        <dependency id="Microsoft.TestPlatform.AdapterUtilities" version="[16.9.1, )" />
       </group>
     </dependencies>
   </metadata>