Merge pull request #76 from ivanz/iz-fix-vs2017-15-5

Fix support for VS2017 15.5.x

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

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
     <AssemblyName>Machine.VSTestAdapter.Specs</AssemblyName>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

Source/Machine.VSTestAdapter/Machine.VSTestAdapter.csproj

@@ -5,18 +5,20 @@
     <_TargetDotNetFramework>net46</_TargetDotNetFramework>
 
     <TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
-
+    <!-- Needed in order to later manually include the libs in the build directory instead of lib -->
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+
     <AssemblyName>Machine.TestAdapter</AssemblyName>
     <Product>Machine.Specifications.Runner.VisualStudio</Product>
     <AssemblyTitle>Machine.Specifications.Runner.VisualStudio</AssemblyTitle>
     <PackageId>Machine.Specifications.Runner.VisualStudio </PackageId>
     <Version>1.0.0</Version>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <Authors>https://github.com/machine/machine.vstestadapter</Authors>
     <PackageProjectUrl>https://github.com/machine/machine.vstestadapter</PackageProjectUrl>
     <PackageReleaseNotes>https://github.com/machine/machine.vstestadapter/releases</PackageReleaseNotes>
     <Description>Machine.Specifications (MSpec) adapter for .NET Framework and .NET Core including dotnet cli (dotnet test), Visual Studio IDE, TFS, Visual Studio Online, Visual Studio Team Services.</Description>
     <PackageTags>mspec unit testing context specification bdd tdd tfs visualstudio vsts vso</PackageTags>
-    <IsTool>true</IsTool>
     <PackageIconUrl>http://github.com/machine/machine.vstestadapter/raw/master/Misc/Machine.VSTestAdapter-64x64.png</PackageIconUrl>
   </PropertyGroup>
 
@@ -60,10 +62,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-
   <ItemGroup>
     <!-- .NET Core -->
     <Content Include="Machine.Specifications.Runner.VisualStudio.props">
@@ -88,12 +86,5 @@
       <Pack>true</Pack>
       <PackagePath>build\$(_TargetDotNetFramework)\</PackagePath>
     </Content>
-
-    <!-- .NET Framework - support for the old .csproj and vstest.console/IDE tooling -->
-    <Content Include="bin\$(Configuration)\$(_TargetDotNetFramework)\*.dll">
-      <Pack>true</Pack>
-      <PackagePath>tools\</PackagePath>
-    </Content>
   </ItemGroup>
-
 </Project>

Source/SampleSpecs/SampleSpecs.csproj

@@ -3,6 +3,7 @@
     <TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
     <AssemblyName>SampleSpecs</AssemblyName>
     <OutputPath>..\testdata\</OutputPath>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

appveyor.yml

@@ -1,15 +1,35 @@
 environment:
-  nuget_version: '2.5.2'
-  nuget_prerelease: false
- # vsix_version: '2.1.0'
-  assembly_version: '2.5.2'
+  nuget_version: '2.6.0-beta1'
+  assembly_version: '2.6.0'
+  nuget_prerelease: true
 
 version: '$(nuget_version)+{build}'
 
+pull_requests:
+  do_not_increment_build_number: true
+
+configuration: Release
+image: Visual Studio 2017
+
+dotnet_csproj:
+  patch: true
+  file: '**\*.csproj'
+  version: '$(nuget_version)'
+  assembly_version: '$(assembly_version)'
+
+before_build: dotnet restore
+
+build:
+  publish_nuget: true
+  publish_nuget_symbols: true
+  verbosity: minimal  
+
+test_script: dotnet test -c %CONFIGURATION% Source\Machine.VSTestAdapter.Specs
+
 deploy:
   - provider: GitHub
     description: |
-      * Fixed slow test discovvery for large solutions (#74 - @bjuris)
+      * Fix to support for VS 2017 15.5.x
 
     on:
       appveyor_repo_tag: true
@@ -23,42 +43,4 @@ deploy:
     api_key:
       secure: R+qirYPrTX9IzJHpRLL6KAV1Lo+vlAnInf6ShiIB2rAGIP28ceJxRAh1jirHE/uD
     on:
-      appveyor_repo_tag: true
-
-
-clone_depth: 5
-
-pull_requests:
-  do_not_increment_build_number: true
-
-configuration: Release
-platform: Any CPU
-
-#assembly_info:
-#  patch: true
-#  file: Source\**\AssemblyInfo.*
-#  assembly_version: '$(assembly_version).{build}'
-#  assembly_file_version: '$(assembly_version).{build}'
-#  assembly_informational_version: '$(nuget_version)'
-
-#before_build:
-#- cmd: >-
-#    powershell -f patch-vsix-version.ps1 -version "%VSIX_VERSION%.%APPVEYOR_BUILD_NUMBER%" -manifestFile "Source\Machine.VSTestAdapter.VSIX\source.extension.vsixmanifest"
-
-image: Visual Studio 2017
-
-build_script:
-- cmd: >-
-    dotnet restore
-
-    dotnet build
-
-    dotnet test Source\Machine.VSTestAdapter.Specs\Machine.VSTestAdapter.Specs.csproj
-
-    dotnet pack Source\Machine.VSTestAdapter\Machine.VSTestAdapter.csproj -c Release /p:Version=%NUGET_VERSION%
-
-test: off
-
-artifacts:
-- path: Source\**\*.nupkg
-
+      appveyor_repo_tag: true

machine.vstestadapter.sln

@@ -9,7 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{405D88EB
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		appveyor.yml = appveyor.yml
-		patch-vsix-version.ps1 = patch-vsix-version.ps1
 		README.md = README.md
 	EndProjectSection
 EndProject