Created release 1.3.0.0 of the NUnit, xUnit, and MsTest NuGet packages.

dmohl · Jun 29, 2014 · 069f48d · 069f48d
1 parent e4284c2
commit 069f48d
Show file tree

Hide file tree

Showing 52 changed files with 192 additions and 67 deletions.
diff --git a/FsUnit.sln b/FsUnit.sln
@@ -1,6 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30324.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{A61D7458-5FB0-49AC-ADC8-1896EA316CE6}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\NuGet.Config = .nuget\NuGet.Config
+		.nuget\NuGet.exe = .nuget\NuGet.exe
+		.nuget\NuGet.targets = .nuget\NuGet.targets
+	EndProjectSection
+EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsUnit.NUnit", "src\FsUnit.NUnit\FsUnit.NUnit.fsproj", "{3890DC0F-5225-4ADF-9B9E-F6A482046A9E}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsUnit.NUnit.Test", "tests\FsUnit.NUnit.Test\FsUnit.NUnit.Test.fsproj", "{025096F3-20FB-40F2-8CAA-34EFDA450E87}"
@@ -19,13 +28,6 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsUnit.MsTestUnit", "src\Fs
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fs30Unit.MsTest.Test", "tests\FsUnit.MsTest.Test\Fs30Unit.MsTest.Test.fsproj", "{EEDD7886-D39F-4F4C-AD9A-13D98510A164}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{A61D7458-5FB0-49AC-ADC8-1896EA316CE6}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/NuGet/Fs30Unit.MsTest.1.1.0.2.nupkg → NuGet/Fs30Unit.MsTest.1.3.0.0.nupkg b/NuGet/Fs30Unit.MsTest.1.1.0.2.nupkg → NuGet/Fs30Unit.MsTest.1.3.0.0.nupkg
diff --git a/NuGet/Fs30Unit.MsTest.Sample.1.1.0.2.nupkg → NuGet/Fs30Unit.MsTest.Sample.1.3.0.0.nupkg b/NuGet/Fs30Unit.MsTest.Sample.1.1.0.2.nupkg → NuGet/Fs30Unit.MsTest.Sample.1.3.0.0.nupkg
diff --git a/NuGet/FsUnit.1.1.0.2.nupkg b/NuGet/FsUnit.1.1.0.2.nupkg
diff --git a/NuGet/FsUnit.1.2.1.0.nupkg b/NuGet/FsUnit.1.2.1.0.nupkg
diff --git a/NuGet/FsUnit.1.3.0.0.nupkg b/NuGet/FsUnit.1.3.0.0.nupkg
diff --git a/NuGet/FsUnit.MbUnit.1.1.1.2.nupkg → NuGet/FsUnit.MbUnit.1.3.0.0.nupkg b/NuGet/FsUnit.MbUnit.1.1.1.2.nupkg → NuGet/FsUnit.MbUnit.1.3.0.0.nupkg
diff --git a/NuGet/FsUnit.MbUnit.Sample.1.1.1.2.nupkg → NuGet/FsUnit.MbUnit.Sample.1.3.0.0.nupkg b/NuGet/FsUnit.MbUnit.Sample.1.1.1.2.nupkg → NuGet/FsUnit.MbUnit.Sample.1.3.0.0.nupkg
diff --git a/NuGet/FsUnit.MbUnit/FsUnit.MbUnit.1.1.1.2.nupkg b/NuGet/FsUnit.MbUnit/FsUnit.MbUnit.1.1.1.2.nupkg
diff --git a/NuGet/FsUnit.MbUnit/FsUnit.MbUnit.Sample.1.1.1.2.nupkg b/NuGet/FsUnit.MbUnit/FsUnit.MbUnit.Sample.1.1.1.2.nupkg
diff --git a/NuGet/FsUnit.MbUnit/FsUnit.MbUnit.Sample.nuspec b/NuGet/FsUnit.MbUnit/FsUnit.MbUnit.Sample.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>FsUnit.MbUnit.Sample</id>
-    <version>1.1.1.2</version>
+    <version>1.3.0.0</version>
     <dependencies>
       <dependency id="MbUnit" version="3.3.454.0" />
     </dependencies>

diff --git a/NuGet/FsUnit.MbUnit/FsUnit.MbUnit.nuspec b/NuGet/FsUnit.MbUnit/FsUnit.MbUnit.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>FsUnit.MbUnit</id>
-    <version>1.1.1.2</version>
+    <version>1.3.0.0</version>
     <dependencies>
       <dependency id="MbUnit" version="3.3.454.0" />
     </dependencies>

diff --git a/NuGet/FsUnit.MbUnit/Lib/Net20/FsUnit.CustomMatchers.dll b/NuGet/FsUnit.MbUnit/Lib/Net20/FsUnit.CustomMatchers.dll
diff --git a/NuGet/FsUnit.MbUnit/Lib/Net20/FsUnit.MbUnit.dll b/NuGet/FsUnit.MbUnit/Lib/Net20/FsUnit.MbUnit.dll
diff --git a/NuGet/FsUnit.MbUnit/Lib/Net20/FsUnit.MbUnit.xml b/NuGet/FsUnit.MbUnit/Lib/Net20/FsUnit.MbUnit.xml
diff --git a/NuGet/FsUnit.MsTest/Fs30Unit.MsTest.1.1.0.2.nupkg b/NuGet/FsUnit.MsTest/Fs30Unit.MsTest.1.1.0.2.nupkg
diff --git a/NuGet/FsUnit.MsTest/Fs30Unit.MsTest.Sample.1.1.0.2.nupkg b/NuGet/FsUnit.MsTest/Fs30Unit.MsTest.Sample.1.1.0.2.nupkg
diff --git a/NuGet/FsUnit.MsTest/Fs30Unit.MsTest.Sample.nuspec b/NuGet/FsUnit.MsTest/Fs30Unit.MsTest.Sample.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Fs30Unit.MsTest.Sample</id>
-    <version>1.1.0.2</version>
+    <version>1.3.0.0</version>
     <authors>Ray Vernagus and Daniel Mohl</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>FsUnit is a set of extensions that add special testing syntax to MsTest.</description>

diff --git a/NuGet/FsUnit.MsTest/Fs30Unit.MsTest.nuspec b/NuGet/FsUnit.MsTest/Fs30Unit.MsTest.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Fs30Unit.MsTest</id>
-    <version>1.1.0.2</version>
+    <version>1.3.0.0</version>
     <authors>Ray Vernagus and Daniel Mohl</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>FsUnit is a set of extensions that add special testing syntax to MsTest.</description>

diff --git a/NuGet/FsUnit.NUnit/FsUnit.1.2.1.0.nupkg b/NuGet/FsUnit.NUnit/FsUnit.1.2.1.0.nupkg
diff --git a/NuGet/FsUnit.NUnit/FsUnit.Sample.1.2.1.0.nupkg b/NuGet/FsUnit.NUnit/FsUnit.Sample.1.2.1.0.nupkg
diff --git a/NuGet/FsUnit.NUnit/FsUnit.Sample.nuspec b/NuGet/FsUnit.NUnit/FsUnit.Sample.nuspec
@@ -2,9 +2,9 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>FsUnit.Sample</id>
-    <version>1.2.1.0</version>
+    <version>1.3.0.0</version>
     <dependencies>
-      <dependency id="NUnit" version="2.6.2" />
+      <dependency id="NUnit" version="2.6.3" />
     </dependencies>
     <authors>Ray Vernagus and Daniel Mohl</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/NuGet/FsUnit.NUnit/FsUnit.nuspec b/NuGet/FsUnit.NUnit/FsUnit.nuspec
@@ -2,9 +2,9 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>FsUnit</id>
-    <version>1.2.1.0</version>
+    <version>1.3.0.0</version>
     <dependencies>
-      <dependency id="NUnit" version="2.6.2" />
+      <dependency id="NUnit" version="2.6.3" />
     </dependencies>
     <authors>Ray Vernagus and Daniel Mohl</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/NuGet/FsUnit.NUnit/Lib/Net20/FsUnit.NUnit.dll b/NuGet/FsUnit.NUnit/Lib/Net20/FsUnit.NUnit.dll
diff --git a/NuGet/FsUnit.Sample.1.1.0.2.nupkg b/NuGet/FsUnit.Sample.1.1.0.2.nupkg
diff --git a/NuGet/FsUnit.Sample.1.2.1.0.nupkg b/NuGet/FsUnit.Sample.1.2.1.0.nupkg
diff --git a/NuGet/FsUnit.Sample.1.3.0.0.nupkg b/NuGet/FsUnit.Sample.1.3.0.0.nupkg
diff --git a/NuGet/FsUnit.xUnit.1.1.1.3.nupkg b/NuGet/FsUnit.xUnit.1.1.1.3.nupkg
diff --git a/...t/FsUnit.xUnit/FsUnit.xUnit.1.2.2.1.nupkg → NuGet/FsUnit.xUnit.1.3.0.0.nupkg b/...t/FsUnit.xUnit/FsUnit.xUnit.1.2.2.1.nupkg → NuGet/FsUnit.xUnit.1.3.0.0.nupkg
diff --git a/NuGet/FsUnit.xUnit.Sample.1.1.1.3.nupkg b/NuGet/FsUnit.xUnit.Sample.1.1.1.3.nupkg
diff --git a/...t.xUnit/FsUnit.xUnit.Sample.1.2.2.1.nupkg → NuGet/FsUnit.xUnit.Sample.1.3.0.0.nupkg b/...t.xUnit/FsUnit.xUnit.Sample.1.2.2.1.nupkg → NuGet/FsUnit.xUnit.Sample.1.3.0.0.nupkg
diff --git a/NuGet/FsUnit.xUnit/FsUnit.xUnit.Sample.nuspec b/NuGet/FsUnit.xUnit/FsUnit.xUnit.Sample.nuspec
@@ -2,16 +2,16 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>FsUnit.xUnit.Sample</id>
-    <version>1.2.2.1</version>
+    <version>1.3.0.0</version>
     <dependencies>
       <group targetFramework="net20">
-        <dependency id="xunit" version="[1.9.0.1565, 3.0)" />
+        <dependency id="xunit" version="[1.9.1, 3.0)" />
       </group>  
       <group targetFramework="net40">
-        <dependency id="xunit" version="[1.9.0.1565, 3.0)" />
+        <dependency id="xunit" version="[1.9.1, 3.0)" />
       </group>  
       <group targetFramework="net45">
-        <dependency id="xunit" version="[1.9.0.1565, 3.0)" />
+        <dependency id="xunit" version="[1.9.1, 3.0)" />
       </group>
     </dependencies>
     <authors>Ray Vernagus and Daniel Mohl</authors>

diff --git a/NuGet/FsUnit.xUnit/FsUnit.xUnit.nuspec b/NuGet/FsUnit.xUnit/FsUnit.xUnit.nuspec
@@ -2,16 +2,16 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>FsUnit.xUnit</id>
-    <version>1.2.2.1</version>
+    <version>1.3.0.0</version>
     <dependencies>
       <group targetFramework="net20">
-        <dependency id="xunit" version="[1.9.0.1565, 3.0)" />
+        <dependency id="xunit" version="[1.9.1, 3.0)" />
       </group>  
       <group targetFramework="net40">
-        <dependency id="xunit" version="[1.9.0.1565, 3.0)" />
+        <dependency id="xunit" version="[1.9.1, 3.0)" />
       </group>  
       <group targetFramework="net45">
-        <dependency id="xunit" version="[1.9.0.1565, 3.0)" />
+        <dependency id="xunit" version="[1.9.1, 3.0)" />
       </group>
     </dependencies>
     <authors>Ray Vernagus and Daniel Mohl</authors>

diff --git a/NuGet/FsUnit.xUnit/Lib/NET20/FsUnit.CustomMatchers.dll b/NuGet/FsUnit.xUnit/Lib/NET20/FsUnit.CustomMatchers.dll
diff --git a/NuGet/FsUnit.xUnit/Lib/NET20/FsUnit.Xunit.dll b/NuGet/FsUnit.xUnit/Lib/NET20/FsUnit.Xunit.dll
diff --git a/NuGet/FsUnit.xUnit/Lib/NET20/FsUnit.Xunit.xml b/NuGet/FsUnit.xUnit/Lib/NET20/FsUnit.Xunit.xml
diff --git a/build.bat b/build.bat
@@ -1,6 +1,6 @@
 @echo off
 cls
 if not exist packages\FAKE\tools\Fake.exe ( 
-	".nuget\NuGet.exe" "install" "FAKE" "-OutputDirectory" "packages" "-ExcludeVersion" "-Prerelease
+	".nuget\NuGet.exe" "install" "FAKE" "-OutputDirectory" "packages" "-ExcludeVersion" "-Prerelease"
 )
 "packages\FAKE\tools\Fake.exe" "build.fsx" %*
diff --git a/build.fsx b/build.fsx
@@ -83,7 +83,7 @@ Target? BuildApp <-
         |> Seq.iter (fun (bDir, filename, nuDir) ->  
             CopyFile (nuDir + getVersionConstant + @"/" + filename) (bDir + filename))
 
-    ["v4.0"; "v2.0"] |> Seq.iter(fun v -> buildIt v)
+    ["v2.0"] |> Seq.iter(fun v -> buildIt v)
 
 Target? BuildTest <-
   fun _ ->

diff --git a/src/FsUnit.CustomMatchers/AssemblyInfo.fs b/src/FsUnit.CustomMatchers/AssemblyInfo.fs
@@ -4,7 +4,7 @@ open System.Runtime.CompilerServices
 
 [<assembly: AssemblyTitle("FsUnit.CustomMatchers")>]
 [<assembly: AssemblyProduct("FsUnit.CustomMatchers")>]
-[<assembly: AssemblyVersion("1.1.0.0")>]
+[<assembly: AssemblyVersion("1.3.0.0")>]
 [<assembly: InternalsVisibleTo("FsUnit.MbUnit.Test")>]
 [<assembly: InternalsVisibleTo("FsUnit.Xunit.Test")>]
 do()
diff --git a/src/FsUnit.CustomMatchers/FsUnit.CustomMatchers.fsproj b/src/FsUnit.CustomMatchers/FsUnit.CustomMatchers.fsproj
@@ -14,6 +14,7 @@
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFSharpCoreVersion>2.3.0.0</TargetFSharpCoreVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,18 +38,30 @@
   <PropertyGroup>
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets'))" />
-  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (!Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets'))" />
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '11.0'">
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="CustomMatchers.fs" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>True</Private>
+    </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="FSharp.Core" />
     <Reference Include="NHamcrest">
       <HintPath>..\..\packages\NHamcrest.1.2.1\lib\NHamcrest.dll</HintPath>
       <Private>True</Private>

diff --git a/src/FsUnit.MbUnit/AssemblyInfo.fs b/src/FsUnit.MbUnit/AssemblyInfo.fs
@@ -4,6 +4,6 @@ open System.Runtime.CompilerServices
 
 [<assembly: AssemblyTitle("FsUnit.MbUnit")>]
 [<assembly: AssemblyProduct("FsUnit.MbUnit")>]
-[<assembly: AssemblyVersion("1.1.0.0")>]
+[<assembly: AssemblyVersion("1.3.0.0")>]
 [<assembly: InternalsVisibleTo("FsUnit.MbUnit.Test")>]
 do()
diff --git a/src/FsUnit.MbUnit/FsUnit.MbUnit.fsproj b/src/FsUnit.MbUnit/FsUnit.MbUnit.fsproj
@@ -14,6 +14,7 @@
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFSharpCoreVersion>2.3.0.0</TargetFSharpCoreVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,15 +38,28 @@
   <PropertyGroup>
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets'))" />
-  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (!Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets'))" />
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '11.0'">
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="FsUnit.fs" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Gallio">
       <HintPath>..\..\packages\mbunit.3.3.454.0\lib\net35\Gallio.dll</HintPath>
       <Private>True</Private>
@@ -63,7 +77,6 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="FSharp.Core" />
     <Reference Include="NHamcrest, Version=1.2.1.0, Culture=neutral, PublicKeyToken=31c3ea0b6fcf8c4a">
       <Private>True</Private>
     </Reference>

diff --git a/src/FsUnit.MsTestUnit/AssemblyInfo.fs b/src/FsUnit.MsTestUnit/AssemblyInfo.fs
@@ -4,6 +4,6 @@ open System.Runtime.CompilerServices
 
 [<assembly: AssemblyTitle("FsUnit.MsTest")>]
 [<assembly: AssemblyProduct("FsUnit.MsTest")>]
-[<assembly: AssemblyVersion("1.1.0.0")>]
+[<assembly: AssemblyVersion("1.3.0.0")>]
 [<assembly: InternalsVisibleTo("FsUnit.MsTest.Test")>]
 do()
diff --git a/src/FsUnit.MsTestUnit/FsUnit.MsTestUnit.fsproj b/src/FsUnit.MsTestUnit/FsUnit.MsTestUnit.fsproj
@@ -13,6 +13,7 @@
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,15 +37,27 @@
   <PropertyGroup>
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '11.0'">
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="FsUnit.fs" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

diff --git a/src/FsUnit.NUnit/AssemblyInfo.fs b/src/FsUnit.NUnit/AssemblyInfo.fs
@@ -4,6 +4,6 @@ open System.Runtime.CompilerServices
 
 [<assembly: AssemblyTitle("FsUnit.NUnit")>]
 [<assembly: AssemblyProduct("FsUnit.NUnit")>]
-[<assembly: AssemblyVersion("1.2.1.0")>]
+[<assembly: AssemblyVersion("1.3.0.0")>]
 [<assembly: InternalsVisibleTo("FsUnit.NUnit.Test")>]
 do()
diff --git a/src/FsUnit.NUnit/FsUnit.NUnit.fsproj b/src/FsUnit.NUnit/FsUnit.NUnit.fsproj
@@ -14,6 +14,7 @@
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFSharpCoreVersion>2.3.0.0</TargetFSharpCoreVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -35,18 +36,30 @@
   <PropertyGroup>
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets'))" />
-  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (!Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets'))" />
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '11.0'">
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
   <ItemGroup>
     <None Include="packages.config" />
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="FsUnit.fs" />
     <Compile Include="GenericAssert.fs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>True</Private>
+    </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="FSharp.Core" />
     <Reference Include="nunit.framework">
       <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
@@ -60,4 +73,4 @@
 	<Target Name="AfterBuild">
 	</Target>
 	-->
-</Project>
+</Project>
diff --git a/src/FsUnit.Xunit/AssemblyInfo.fs b/src/FsUnit.Xunit/AssemblyInfo.fs
@@ -4,6 +4,6 @@ open System.Runtime.CompilerServices
 
 [<assembly: AssemblyTitle("FsUnit.Xunit")>]
 [<assembly: AssemblyProduct("FsUnit.Xunit")>]
-[<assembly: AssemblyVersion("1.1.0.0")>]
+[<assembly: AssemblyVersion("1.3.0.0")>]
 [<assembly: InternalsVisibleTo("FsUnit.Xunit.Test")>]
 do()