Merge pull request #77 from ivanz/iz-more-vs2017-fixes

Fix running full .NET Framework (old and new style csproj) with VS 2017 15.5.x

Author: ivanz

Source/Machine.VSTestAdapter.Specs/Machine.VSTestAdapter.Specs.csproj

@@ -10,9 +10,9 @@
     <PackageReference Include="Machine.Fakes.Moq" Version="2.8.0" />
     <PackageReference Include="Machine.Specifications" Version="0.12.0" />
     <PackageReference Include="Machine.Specifications.Should" Version="0.11.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.0.0" Condition="'$(TargetFramework)'=='netstandard1.5'" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="11.0.0" Condition="'$(TargetFramework)'=='net46'" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.5.0" Condition="'$(TargetFramework)'=='net46'" />
   </ItemGroup>
 
   <ItemGroup>

Source/Machine.VSTestAdapter/Machine.VSTestAdapter.csproj

@@ -26,25 +26,23 @@
     <DefineConstants>NETSTANDARD</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'==$(_TargetDotNet)">
-    <PackageReference Include="Mono.Cecil" Version="[0.10-*, 0.11)" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[15.0.0,16)">
-      <PrivateAssets>All</PrivateAssets> <!-- Only a reference during build/dev time -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[15.0.0, 16.0)">
+      <PrivateAssets>All</PrivateAssets>
+      <!-- Only a reference during build/dev time -->
     </PackageReference>
     <PackageReference Include="Machine.Specifications" Version="[0.11.0, 1.0)">
       <PrivateAssets>All</PrivateAssets>
       <!-- Only a reference during build/dev time -->
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'==$(_TargetDotNet)">
+    <PackageReference Include="Mono.Cecil" Version="[0.10-*, 0.11)" />
+  </ItemGroup>
+  
   <ItemGroup Condition="'$(TargetFramework)'=='$(_TargetDotNetFramework)'">
     <PackageReference Include="Mono.Cecil" Version="0.9.6.1" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[11.0.0,16.0.0)">
-      <PrivateAssets>All</PrivateAssets> <!-- Only a reference during build/dev time -->
-    </PackageReference>
-    <PackageReference Include="Machine.Specifications" Version="[0.11.0, 1.0)">
-      <PrivateAssets>All</PrivateAssets> <!-- Only a reference during build/dev time -->
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

appveyor.yml

@@ -1,5 +1,5 @@
 environment:
-  nuget_version: '2.6.0-beta1'
+  nuget_version: '2.6.0-beta2'
   assembly_version: '2.6.0'
   nuget_prerelease: true
 
@@ -30,6 +30,7 @@ deploy:
   - provider: GitHub
     description: |
       * Fix to support for VS 2017 15.5.x
+      * Visual Studio 2015 is no longer supported
 
     on:
       appveyor_repo_tag: true