Update dependencies to NETStandard.Library 1.6.1. (#343)

* Update dependencies to NETStandard.Library 1.6.1. * Fix typo.
microsoft · Jan 19, 2017 · 932eb53 · 932eb53
1 parent 576309b
commit 932eb53
Show file tree

Hide file tree

Showing 15 changed files with 67 additions and 47 deletions.
diff --git a/samples/UnitTestProject/UnitTestProject.csproj b/samples/UnitTestProject/UnitTestProject.csproj
@@ -21,9 +21,9 @@
     <PackageReference Include="MSTest.TestAdapter">
       <Version>1.1.8-rc</Version>
     </PackageReference>
-	<PackageReference Include="Microsoft.NET.Test.Sdk">
-	  <Version>15.0.0-preview-20170106-08</Version>
-	</PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk">
+      <Version>15.0.0-preview-20170106-08</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
     <PackageReference Include="Microsoft.NETCore.App">

diff --git a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
     <PackageReference Include="System.Runtime.Loader">
-      <Version>4.0.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/....TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj b/....TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
     <PackageReference Include="System.Runtime.Serialization.Primitives">
-      <Version>4.1.1</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
@@ -11,16 +11,16 @@
   </PropertyGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
     <PackageReference Include="System.Diagnostics.Process">
-      <Version>4.1.0</Version>
+      <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Diagnostics.TextWriterTraceListener">
+      <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="System.Diagnostics.TraceSource">
-      <Version>4.0.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="System.Threading.Thread">
-      <Version>4.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Diagnostics.TextWriterTraceListener">
-      <Version>4.0.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
@@ -48,4 +48,4 @@
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.CoreUtilities</RootNamespace>
   </PropertyGroup>
   <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-</Project>
+</Project>
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
     <PackageReference Include="System.Diagnostics.Process">
-      <Version>4.1.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

diff --git a/...soft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj b/...soft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
@@ -21,13 +21,13 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
     <PackageReference Include="System.Collections.NonGeneric">
-      <Version>4.0.1</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="System.Security.Principal.Windows">
       <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="System.Collections.Specialized">
-      <Version>4.0.1</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -47,4 +47,4 @@
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger</RootNamespace>
   </PropertyGroup>
   <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-</Project>
+</Project>
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
diff --git a/...TestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj b/...TestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj
diff --git a/src/TestPlatform.ObjectModel.nuspec b/src/TestPlatform.ObjectModel.nuspec
@@ -14,30 +14,25 @@
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <dependencies>
       <group targetFramework="net46">
-        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.0.0, )" />
+        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.3.0, )" />
       </group>
       <group targetFramework="netstandard1.5">
-        <dependency id="NETStandard.Library" version="[1.6.0, )" />
-        <dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
-        <dependency id="System.Runtime.Extensions" version="[4.1.0, )" />
-        <dependency id="System.Xml.XPath.XmlDocument" version="[4.0.1, )" />
-        <dependency id="System.ComponentModel.EventBasedAsync" version="[4.0.11, )" />
-        <dependency id="System.Runtime.InteropServices" version="[4.1.0, )" />
-        <dependency id="System.IO.FileSystem" version="[4.0.1, )" />
-        <dependency id="System.ComponentModel.TypeConverter" version="[4.1.0, )" />
-        <dependency id="System.Security.Cryptography.Algorithms" version="[4.2.0, )" />
-        <dependency id="System.Runtime.Serialization.Json" version="[4.0.2, )" />
-        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.0.0, )" />
-        <dependency id="System.Runtime.Loader" version="[4.0.0, )" />
-        <dependency id="System.Reflection.TypeExtensions" version="[4.1.0, )" />
-        <dependency id="System.Reflection.Metadata" version="[1.3.0, )" />
+        <dependency id="NETStandard.Library" version="[1.6.1, )" />
+        <dependency id="System.ComponentModel.EventBasedAsync" version="[4.3.0, )" />
+        <dependency id="System.ComponentModel.TypeConverter" version="[4.3.0, )" />
+        <dependency id="System.Reflection.TypeExtensions" version="[4.3.0, )" />
+        <dependency id="System.Reflection.Metadata" version="[1.4.2, )" />
+        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.3.0, )" />
+        <dependency id="System.Runtime.Loader" version="[4.3.0, )" />
+        <dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )" />
+        <dependency id="System.Runtime.Serialization.Json" version="[4.3.0, )" />
+        <dependency id="System.Xml.XPath.XmlDocument" version="[4.3.0, )" />
 
         <!-- Dependencies for core utilities -->
-        <dependency id="System.Diagnostics.Tracing" version="[4.1.0, )" />
-        <dependency id="System.Diagnostics.Process" version="[4.1.0, )" />
-        <dependency id="System.Diagnostics.TraceSource" version="[4.0.0, )" />
-        <dependency id="System.Threading.Thread" version="[4.0.0, )" />
-        <dependency id="System.Diagnostics.TextWriterTraceListener" version="[4.0.0, )" />
+        <dependency id="System.Diagnostics.Process" version="[4.3.0, )" />
+        <dependency id="System.Diagnostics.TextWriterTraceListener" version="[4.3.0, )" />
+        <dependency id="System.Diagnostics.TraceSource" version="[4.3.0, )" />
+        <dependency id="System.Threading.Thread" version="[4.3.0, )" />
       </group>
     </dependencies>
     <frameworkAssemblies>

diff --git a/src/TestPlatform.TranslationLayer.nuspec b/src/TestPlatform.TranslationLayer.nuspec
@@ -7,15 +7,40 @@
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>The entry point to Microsoft Test Platform. This is a csharp layer that can drive the test platform confirming to its protocol</description>
+    <description>C# SDK for the test platform protocol. This SDK can be used in IDE or Editors to use test platform for discovery and execution of tests.</description>
     <licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
     <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <dependencies>
-      <!-- VS has a dependency on 8.0.3 version of NewtonSoft.Json. -->
-      <dependency id="Newtonsoft.Json" version="8.0.3"/>
+      <group targetFramework="net46">
+        <!-- VS has a dependency on 8.0.3 version of NewtonSoft.Json. -->
+        <dependency id="Newtonsoft.Json" version="8.0.3"/>
+      </group>
+      <group targetFramework="netstandard1.5">
+        <dependency id="NETStandard.Library" version="[1.6.1, )" />
+        <dependency id="System.ComponentModel.TypeConverter" version="[4.3.0, )" />
+        <dependency id="System.Diagnostics.Process" version="[4.3.0, )" />
+        <dependency id="System.Runtime.InteropServices" version="[4.3.0, )" />
+        <dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )" />
+        <dependency id="System.Xml.XPath.XmlDocument" version="[4.3.0, )" />
+
+        <!-- CommunicationUtilities dependencies are covered above -->
+        <!-- TestPlatform.Common dependencies -->
+        <dependency id="System.Runtime.Loader" version="[4.3.0, )" />
+
+        <!-- TODO: update net46 dependencies list to use OM nuget package -->
+        <dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
+
+        <dependency id="Newtonsoft.Json" version="8.0.3"/>
+      </group>
     </dependencies>
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="System.Xml" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="System.Runtime.Serialization" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.6" />
+    </frameworkAssemblies>
   </metadata>
   <files>
     <!-- Add a third party notice file -->

diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj
@@ -34,7 +34,7 @@
       <Version>1.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.ComponentModel.TypeConverter">
-      <Version>4.1.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj
@@ -34,7 +34,7 @@
       <Version>1.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.ComponentModel.TypeConverter">
-      <Version>4.1.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj
@@ -33,7 +33,7 @@
       <Version>1.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.ComponentModel.TypeConverter">
-      <Version>4.1.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj
@@ -33,13 +33,13 @@
       <Version>1.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.ComponentModel.TypeConverter">
-      <Version>4.1.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="System.Diagnostics.Contracts">
-      <Version>4.0.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="System.Xml.XPath">
-      <Version>4.0.1</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

diff --git a/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj b/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj
@@ -22,15 +22,15 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
     <PackageReference Include="System.Xml.XPath.XmlDocument">
-      <Version>4.0.1</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent">
       <Version>1.0.41</Version>
     </PackageReference>
     <PackageReference Include="System.Text.RegularExpressions">
-      <Version>4.1.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
     <Reference Include="System" />
     <Reference Include="System.Runtime" />