build works on my machine

nojaf · Mar 7, 2018 · 8dc6b9e · 8dc6b9e
1 parent 8e5b97d
commit 8dc6b9e
Show file tree

Hide file tree

Showing 7 changed files with 288 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -169,3 +169,9 @@ TestResults.xml
 *.xml
 .fake/build.fsx_*.dll
 .paket/paket.exe
+paket-files/
+
+
+# JetBrains Rider
+.idea/
+*.sln.iml
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/.paket/paket.bootstrapper.exe b/.paket/paket.bootstrapper.exe
diff --git a/.paket/paket.exe b/.paket/paket.exe
diff --git a/build.fsx b/build.fsx
@@ -9,7 +9,8 @@ open Fake.AssemblyInfoFile
 open Fake.ReleaseNotesHelper
 open System
 
-setEnvironVar "MSBuild" (ProgramFilesX86 @@ @"\MSBuild\12.0\Bin\MSBuild.exe")
+// setEnvironVar "MSBuild" (ProgramFilesX86 @@ @"\MSBuild\12.0\Bin\MSBuild.exe")
+setEnvironVar "MSBuild" (ProgramFilesX86 @@ @"Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe")
 
 // Git configuration (used for publishing documentation in gh-pages branch)
 // The profile where the project is posted 
@@ -84,6 +85,7 @@ Target "UnitTests" (fun _ ->
           { p with
               DisableShadowCopy = true
               TimeOut = TimeSpan.FromMinutes 20.
+              ErrorOutputFile = @"C:\Temp\nunit-error.txt"
               Framework = "4.5"
               Domain = NUnitDomainModel.MultipleDomainModel
               OutputFile = "TestResults.xml" })

diff --git a/src/Fantomas.Tests/Fantomas.Tests.fsproj b/src/Fantomas.Tests/Fantomas.Tests.fsproj
@@ -102,10 +102,10 @@
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="nunit.core">
-      <HintPath>..\packages\NUnit.Runners.2.6.3\tools\lib\nunit.core.dll</HintPath>
+      <HintPath>..\..\packages\NUnit.Runners\tools\lib\nunit.core.dll</HintPath>
     </Reference>
     <Reference Include="nunit.core.interfaces">
-      <HintPath>..\packages\NUnit.Runners.2.6.3\tools\lib\nunit.core.interfaces.dll</HintPath>
+      <HintPath>..\..\packages\NUnit.Runners\tools\lib\nunit.core.interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/Fantomas.Tests/app.config b/src/Fantomas.Tests/app.config
@@ -5,7 +5,7 @@
   <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
   <dependentAssembly>
     <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="2.0.0.0-4.3.1.0" newVersion="4.4.0.0" />
+    <bindingRedirect oldVersion="2.0.0.0-4.4.3.0" newVersion="4.4.0.0" />
   </dependentAssembly>
   <dependentAssembly>
     <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />