Update adapter to expecto >= 8.0

adamchester · May 9, 2018 · e73f4bf · e73f4bf
1 parent 32ff9f5
commit e73f4bf
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/nuspec/Expecto.VisualStudio.TestAdapter.nuspec b/nuspec/Expecto.VisualStudio.TestAdapter.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>Expecto.VisualStudio.TestAdapter</id>
-    <version>8.0.0</version>
+    <version>9.0.0</version>
     <authors>adamchester, MNie</authors>
     <owners>adamchester, MNie</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -15,11 +15,11 @@
     <repository type="git" url="https://github.com/adamchester/expecto-adapter" />
     <dependencies>
       <group targetFramework=".NETFramework4.6.1">
-        <dependency id="Expecto" version="[7.0, 8.0)" />
-        <dependency id="FSharp.Core" version="4.1.18"  />
-        <dependency id="Microsoft.TestPlatform.ObjectModel" version="15.5.0"  />
-        <dependency id="Mono.Cecil" version="0.10.0-beta7"  />
-        <dependency id="Newtonsoft.Json" version="10.0.3"  />
+        <dependency id="Expecto" version="[8.0, 9.0)" />
+        <dependency id="FSharp.Core" version="[4.0, 5.0)"  />
+        <dependency id="Microsoft.TestPlatform.ObjectModel" version="[15.0, 16.0)"  />
+        <dependency id="Mono.Cecil" version="[0.10.0, 0.11.0)"  />
+        <dependency id="Newtonsoft.Json" version="[10.0, 11.0)"  />
       </group>
     </dependencies>
   </metadata>

diff --git a/src/Expecto.VisualStudio.TestAdapter/Expecto.VisualStudio.TestAdapter.fsproj b/src/Expecto.VisualStudio.TestAdapter/Expecto.VisualStudio.TestAdapter.fsproj
@@ -13,14 +13,14 @@
     <PackageReleaseNotes>This version should support &gt;= Expecto 7.0.0</PackageReleaseNotes>
     <Copyright>Copyright © 2016 Ian Griffiths, Copyright © 2017 Expecto Visual Studio Test Adapter Contributors</Copyright>
     <PackageTags>Expecto, Visual Studio, Test Adapter, testadapter</PackageTags>
-    <Version>8.0.0</Version>
+    <Version>9.0.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageProjectUrl>https://github.com/adamchester/expecto-adapter</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/adamchester/expecto-adapter/blob/master/LICENSE</PackageLicenseUrl>
     <RepositoryUrl>https://github.com/adamchester/expecto-adapter</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <AssemblyVersion>8.0.0</AssemblyVersion>
-    <FileVersion>8.0.0</FileVersion>
+    <AssemblyVersion>9.0.0</AssemblyVersion>
+    <FileVersion>9.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -36,10 +36,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="4.1.*" />
-    <PackageReference Include="Expecto" Version="7.*" />
+    <PackageReference Include="FSharp.Core" Version="4.*" />
+    <PackageReference Include="Expecto" Version="8.*" />
     <PackageReference Include="Newtonsoft.Json" Version="10.*" />
-    <PackageReference Include="Mono.Cecil" Version="0.10.0-*" />
+    <PackageReference Include="Mono.Cecil" Version="0.10.*" />
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.*" />
   </ItemGroup>
 

diff --git a/src/Expecto.VisualStudio.sln b/src/Expecto.VisualStudio.sln
@@ -3,14 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2010
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Expecto.VisualStudio.TestAdapter", "Expecto.VisualStudio.TestAdapter\Expecto.VisualStudio.TestAdapter.fsproj", "{1F583D48-8771-45B4-9793-60A69DB06C61}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Expecto.VisualStudio.TestAdapter", "Expecto.VisualStudio.TestAdapter\Expecto.VisualStudio.TestAdapter.fsproj", "{1F583D48-8771-45B4-9793-60A69DB06C61}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Expecto.Vstest.Console", "Expecto.Vstest.Console\Expecto.Vstest.Console.fsproj", "{E0E2673B-41FD-4131-B7CE-50EF315DEA64}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Expecto.Vstest.Console", "Expecto.Vstest.Console\Expecto.Vstest.Console.fsproj", "{E0E2673B-41FD-4131-B7CE-50EF315DEA64}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B2758865-8826-4288-8438-274CC5E6A611}"
 	ProjectSection(SolutionItems) = preProject
 		..\.gitattributes = ..\.gitattributes
 		..\.gitignore = ..\.gitignore
+		..\nuspec\Expecto.VisualStudio.TestAdapter.nuspec = ..\nuspec\Expecto.VisualStudio.TestAdapter.nuspec
 		..\LICENSE = ..\LICENSE
 		..\README.md = ..\README.md
 	EndProjectSection

diff --git a/src/Expecto.Vstest.Console/Expecto.Vstest.Console.fsproj b/src/Expecto.Vstest.Console/Expecto.Vstest.Console.fsproj
@@ -16,14 +16,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="4.1.*" />
-    <PackageReference Include="Expecto" Version="7.*" />
-    <PackageReference Include="Expecto.FsCheck" Version="7.*" />
+    <PackageReference Include="FSharp.Core" Version="4.*" />
+    <PackageReference Include="Expecto" Version="8.*" />
+    <PackageReference Include="Expecto.FsCheck" Version="8.*" />
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.*" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Expecto.VisualStudio.TestAdapter\Expecto.VisualStudio.TestAdapter.fsproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
 </Project>