Polish and Cleanup

- upgraded packages to stable versions - fixed msbuild15 search error for F# targets - cleaned up project files & paket.references - removed unused references
markpattison · Mar 4, 2017 · 047977f · 047977f
1 parent 4573749
commit 047977f
Show file tree

Hide file tree

Showing 23 changed files with 1,817 additions and 3,154 deletions.
diff --git a/build.fsx b/build.fsx
@@ -1,3 +1,4 @@
+System.IO.Directory.SetCurrentDirectory __SOURCE_DIRECTORY__
 // --------------------------------------------------------------------------------------
 // FAKE build script
 // --------------------------------------------------------------------------------------
@@ -61,7 +62,7 @@ let gitName = "Paket"
 // The url for the raw files hosted
 let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/fsprojects"
 
-let dotnetcliVersion = "1.0.0-preview4-004233"
+let dotnetcliVersion = "2.0.0-alpha-005165"
 
 let dotnetSDKPath = System.Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) </> "dotnetcore" |> FullName
 
@@ -130,20 +131,16 @@ Target "AssemblyInfo" (fun _ ->
 
 Target "InstallDotNetCore" (fun _ ->
     let correctVersionInstalled = 
-        try
-            if FileInfo(dotnetExePath |> Path.GetFullPath).Exists then
+        try if FileInfo(dotnetExePath |> Path.GetFullPath).Exists then
                 let processResult = 
                     ExecProcessAndReturnMessages (fun info ->  
                     info.FileName <- dotnetExePath
                     info.WorkingDirectory <- Environment.CurrentDirectory
                     info.Arguments <- "--version") (TimeSpan.FromMinutes 30.)
 
                 processResult.Messages |> separated "" = dotnetcliVersion
-
-            else
-                false
-        with 
-        | _ -> false
+            else false
+        with  _ -> false
 
     if correctVersionInstalled then
         tracefn "dotnetcli %s already installed" dotnetcliVersion
@@ -152,7 +149,7 @@ Target "InstallDotNetCore" (fun _ ->
         let archiveFileName = 
             if isLinux then
                 sprintf "dotnet-dev-ubuntu-x64.%s.tar.gz" dotnetcliVersion
-            else if Fake.EnvironmentHelper.isMacOS then
+            elif Fake.EnvironmentHelper.isMacOS then
                 sprintf "dotnet-dev-osx-x64.%s.tar.gz" dotnetcliVersion
             else
                 sprintf "dotnet-dev-win-x64.%s.zip" dotnetcliVersion
@@ -201,7 +198,10 @@ Target "CleanDocs" (fun _ ->
 
 Target "Build" (fun _ ->
     !! solutionFile
-    |> MSBuildRelease "" "Rebuild"
+    |> MSBuildReleaseExt "" [
+            "VisualStudioVersion", "14.0"
+            "ToolsVersion"       , "14.0"  
+    ] "Rebuild"
     |> ignore
 )
 

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "2.0.0-alpha-005165"
+  }
+}
diff --git a/integrationtests/Paket.IntegrationTests/App.config b/integrationtests/Paket.IntegrationTests/App.config
@@ -12,4 +12,9 @@
     <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
     <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="9.0.0.0" />
   </dependentAssembly>
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.1.0.0" />
+  </dependentAssembly>
 </assemblyBinding></runtime></configuration>
diff --git a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj
diff --git a/integrationtests/Paket.IntegrationTests/packages.config b/integrationtests/Paket.IntegrationTests/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit3TestAdapter" version="3.6.0" />
+  <package id="NUnit3TestAdapter" version="3.7.0" />
 </packages>
diff --git a/paket.dependencies b/paket.dependencies
@@ -2,20 +2,20 @@ source https://nuget.org/api/v2
 
 nuget Newtonsoft.Json redirects: force
 nuget Argu prerelease
-nuget FSharp.Core prerelease redirects: force
+nuget FSharp.Core == 4.0.1.7-alpha redirects: force
 nuget Chessie >= 0.6
 nuget Mono.Cecil prerelease
 
-nuget FSharp.NET.Sdk prerelease       
-nuget System.Diagnostics.TraceSource prerelease
-nuget System.Diagnostics.FileVersionInfo prerelease
-nuget System.Xml.XDocument prerelease 
-nuget System.Xml.XPath.XmlDocument prerelease
-nuget System.Diagnostics.Process prerelease
-nuget System.Xml.XPath.XDocument prerelease
-nuget System.Security.Cryptography.ProtectedData prerelease
-nuget System.Security.Cryptography.Algorithms prerelease
-
+nuget FSharp.NET.Sdk      
+nuget System.Diagnostics.TraceSource 
+nuget System.Diagnostics.FileVersionInfo 
+nuget System.Xml.XDocument 
+nuget System.Xml.XPath.XmlDocument 
+nuget System.Diagnostics.Process 
+nuget System.Xml.XPath.XDocument 
+nuget System.Security.Cryptography.ProtectedData 
+nuget System.Security.Cryptography.Algorithms 
+nuget Microsoft.NETCore.App 1.1.0
 
 github fsharp/FAKE src/app/FakeLib/Globbing/Globbing.fs
 github fsprojects/FSharp.TypeProviders.StarterPack src/AssemblyReader.fs
@@ -40,6 +40,6 @@ group Test
   nuget NUnit
   nuget NUnit.Console
   nuget NUnit3TestAdapter version_in_path: true               
-  nuget FSharp.Core == 4.0.1.7-alpha redirects: force
+  nuget FSharp.Core  == 4.0.1.7-alpha redirects: force
 
   github forki/FsUnit FsUnit.fs