fsprojects · matthid · Apr 23, 2017 · Apr 1, 2017 · Apr 2, 2017 · Apr 2, 2017
diff --git a/.gitignore b/.gitignore
@@ -29,4 +29,5 @@ release.cmd
 *.log
 *.svclog
 
-.paket/paket.exe
+.paket/paket.exe
+fsbuild.targets
diff --git a/.paket/paket.targets b/.paket/paket.targets
@@ -1,38 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
   <PropertyGroup>
     <!-- Enable the restore command to run before builds -->
     <RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
-    <!-- Download Paket.exe if it does not already exist -->
-    <DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket>
     <PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
     <PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
+    <MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
+    <MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
   </PropertyGroup>
+
   <PropertyGroup>
     <!-- Paket command -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
     <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
-    <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
-    <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(PaketExePath)</PaketCommand>
-    <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
-    <PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(PaketBootStrapperExePath)</PaketBootStrapperCommand>
-    <!-- Commands -->
-    <PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
+    <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
+  </PropertyGroup>
+
+  <Choose> <!-- MyProject.fsproj.paket.references has the highest precedence -->
+    <When Condition="Exists('$(MSBuildProjectFullPath).paket.references')">
+      <PropertyGroup>
+        <PaketReferences>$(MSBuildProjectFullPath).paket.references</PaketReferences>
+      </PropertyGroup>
+    </When> <!-- MyProject.paket.references -->
+    <When Condition="Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references')">
+      <PropertyGroup>
+        <PaketReferences>$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketReferences>
+      </PropertyGroup>
+    </When> <!-- paket.references -->
+    <When Condition="Exists('$(MSBuildProjectDirectory)\paket.references')">
+      <PropertyGroup>
+        <PaketReferences>$(MSBuildProjectDirectory)\paket.references</PaketReferences>
+      </PropertyGroup>
+    </When> <!-- Set to empty if a reference file isn't found matching one of the 3 format options -->
+    <Otherwise>
+      <PropertyGroup>
+        <PaketReferences></PaketReferences>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <PropertyGroup>
+  <!-- Commands -->
+    <PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketReferences>
+    <PaketReferences Condition="!Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
+    <PaketReferences Condition="!Exists('$(PaketReferences)')">$(MSBuildStartupDirectory)\paket.references</PaketReferences>
     <PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>
     <RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand>
-    <DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand>
     <!-- We need to ensure packages are restored prior to assembly resolve -->
     <BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn>
   </PropertyGroup>
-  <Target Name="CheckPrerequisites">
-    <!-- Raise an error if we're unable to locate paket.exe -->
-    <Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" />
-    <MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" />
-  </Target>
-  <Target Name="DownloadPaket">
-    <Exec Command="$(DownloadPaketCommand)" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" />
-  </Target>
-  <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
-    <Exec Command="$(RestoreCommand)" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" />
+  <Target Name="RestorePackages">
+    <Exec Command="$(RestoreCommand)" 
+          IgnoreStandardErrorWarningFormat="true" 
+          WorkingDirectory="$(PaketRootPath)" 
+          ContinueOnError="true" 
+          Condition=" Exists('$(PaketReferences)') AND '$(PaketReferences)' != '' " 
+    />
   </Target>
 </Project>
diff --git a/FSharp.Formatting.nunit b/FSharp.Formatting.nunit
diff --git a/build.cmd b/build.cmd
@@ -1,9 +1,13 @@
 @echo off
 
-.paket\paket.exe restore
+.paket\paket.bootstrapper.exe
 if errorlevel 1 (
   exit /b %errorlevel%
 )
 
-packages\FAKE\tools\FAKE.exe build.fsx %*
+.paket\paket.exe restore
+if errorlevel 1 (
+  exit /b %errorlevel%
+)
 
+packages\FAKE\tools\FAKE.exe build.fsx %*
diff --git a/build.fsx b/build.fsx
@@ -102,7 +102,7 @@ let solutionFile = "FSharp.Formatting.sln"
 
 let msbuild14 = ProgramFilesX86</>"MSBuild"</>"14.0"</>"Bin"</>"MSBuild.exe"
 
-if isWindows && fileExists msbuild14 then 
+if isWindows && fileExists msbuild14 then
     setEnvironVar "MSBUILD"  msbuild14
 
 Target "Build" (fun _ ->
@@ -143,7 +143,7 @@ Target "MergeVSPowerTools" (fun _ ->
 Target "BuildTests" (fun _ ->
     {   BaseDirectory = __SOURCE_DIRECTORY__
         Includes = ["FSharp.Formatting.sln"]
-        Excludes = [] 
+        Excludes = []
     }   |> MSBuildRelease "" "Build"
         |> ignore
 
@@ -172,7 +172,7 @@ Target "BuildTests" (fun _ ->
     |> ignore
 )
 
-open Fake.Testing 
+open Fake.Testing
 
 let testProjects =
   [ "FSharp.CodeFormat.Tests"; "FSharp.Literate.Tests";

diff --git a/build.sh b/build.sh
@@ -1,24 +1,45 @@
-#!/bin/bash
+#!/usr/bin/env bash
 if test "$OS" = "Windows_NT"
 then
   # use .Net
 
+  .paket/paket.bootstrapper.exe
+  exit_code=$?
+  if [ $exit_code -ne 0 ]; then
+  	exit $exit_code
+  fi
+
   .paket/paket.exe restore
   exit_code=$?
   if [ $exit_code -ne 0 ]; then
-    exit $exit_code
+  	exit $exit_code
   fi
 
-  packages/FAKE/tools/FAKE.exe build.fsx $@
+  packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx 
 else
   # use mono
-
+  mono .paket/paket.bootstrapper.exe
+  exit_code=$?
+  if [ $exit_code -ne 0 ]; then
+    certificate_count=$(certmgr -list -c Trust | grep X.509 | wc -l)
+    if [ $certificate_count -le 1 ]; then
+      echo "Couldn't download Paket. This might be because your Mono installation"
+      echo "doesn't have the right SSL root certificates installed. One way"
+      echo "to fix this would be to download the list of SSL root certificates"
+      echo "from the Mozilla project by running the following command:"
+      echo ""
+      echo "    mozroots --import --sync"
+      echo ""
+      echo "This will import over 100 SSL root certificates into your Mono"
+      echo "certificate repository. Then try running the build script again."
+    fi
+  	exit $exit_code
+  fi
 
   mono .paket/paket.exe restore
   exit_code=$?
   if [ $exit_code -ne 0 ]; then
-    exit $exit_code
+  	exit $exit_code
   fi
-
-  mono packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
+  mono packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx 
 fi
diff --git a/csharp/MarkdownSharp/MarkdownSharp.csproj b/csharp/MarkdownSharp/MarkdownSharp.csproj
@@ -1,24 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{37619116-CCE8-465A-8B1F-081CA53364BB}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MarkdownSharp</RootNamespace>
     <AssemblyName>MarkdownSharp</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>

diff --git a/paket.dependencies b/paket.dependencies
@@ -5,12 +5,11 @@ source https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json
 redirects: on
 
 nuget FSharp.Data
-nuget FSharp.Compiler.Tools
 nuget FAKE
 nuget CommandLineParser
 nuget FSharp.Core  redirects:force, content:none
 nuget Microsoft.AspNet.Razor
-nuget RazorEngine 3.9.3 framework: net45
+nuget RazorEngine 3.9.3 framework: >= net45
 nuget FSharp.Compiler.Service content:none
 nuget ILRepack
 nuget Argu

diff --git a/paket.lock b/paket.lock
@@ -46,7 +46,6 @@ NUGET
       System.Text.Encoding.Extensions (>= 4.3) - framework: >= netstandard16
       System.Threading (>= 4.3) - framework: >= netstandard16
       System.Threading.Tasks (>= 4.3) - framework: >= netstandard16
-    FSharp.Compiler.Tools (4.1.5)
     FSharp.Core (4.1.12) - content: none, redirects: force
       System.Collections (>= 4.0.11) - framework: >= netstandard16
       System.Console (>= 4.0) - framework: >= netstandard16
@@ -156,7 +155,7 @@ NUGET
       System.Threading.Timer (>= 4.3) - framework: >= net451, >= netstandard12
       System.Xml.ReaderWriter (>= 4.3) - framework: >= netstandard10
       System.Xml.XDocument (>= 4.3) - framework: >= netstandard10
-    RazorEngine (3.9.3) - framework: net45
+    RazorEngine (3.9.3) - framework: >= net45
       Microsoft.AspNet.Razor (>= 3.0) - framework: >= net45
     runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3) - content: none, framework: >= net463, >= netstandard16
     runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3) - content: none, framework: >= net463, >= netstandard16

diff --git a/src/CSharpFormat/CSharpFormat.csproj b/src/CSharpFormat/CSharpFormat.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

diff --git a/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj b/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj
@@ -38,9 +38,9 @@
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
   </PropertyGroup>
   <Choose>
-    <When Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.1\Microsoft.FSharp.Targets')">
+    <When Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.1\Framework\v4.0\Microsoft.FSharp.Targets')">
       <PropertyGroup>
-        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.1\Microsoft.FSharp.Targets</FSharpTargetsPath>
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.1\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
       </PropertyGroup>
     </When>
     <When Condition="'$(VisualStudioVersion)' != '11.0' and Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">

diff --git a/src/FSharp.CodeFormat/SourceCode.fs b/src/FSharp.CodeFormat/SourceCode.fs
@@ -12,14 +12,14 @@ namespace FSharp.CodeFormat
 type ToolTipSpans = list<ToolTipSpan>
 
 /// A tool tip span can be emphasized text, plain text `Literal` or a line brak
-and ToolTipSpan = 
+and ToolTipSpan =
     | Emphasis of ToolTipSpans
     | Literal of string
     | HardLineBreak
 
 /// Classifies tokens reported by the FCS
-[<Struct>][<RequireQualifiedAccess>]
-type TokenKind = 
+[<RequireQualifiedAccess>]
+type TokenKind =
     | Keyword
     | String
     | Comment
@@ -30,7 +30,7 @@ type TokenKind =
     | Punctuation
     | Preprocessor
     | Module
-    | ReferenceType 
+    | ReferenceType
     | ValueType
     | Interface
     | TypeArgument
@@ -47,16 +47,16 @@ type TokenKind =
 
 
 /// Represents a kind of error reported from the F# compiler (warning or error)
-[<Struct>][<RequireQualifiedAccess>]
-type ErrorKind = 
+[<RequireQualifiedAccess>]
+type ErrorKind =
   | Error
   | Warning
 
 /// A token in a parsed F# code snippet. Aside from standard tokens reported from
 /// the compiler (`Token`), this also includes `Error` (wrapping the underlined
 /// tokens), `Omitted` for the special `[omit:...]` tags and `Output` for the special
 /// `[output:...]` tag
-type TokenSpan = 
+type TokenSpan =
   | Token of TokenKind * string * ToolTipSpans option
   | Error of ErrorKind * string * TokenSpans
   | Omitted of string * string

diff --git a/src/FSharp.CodeFormat/app.config b/src/FSharp.CodeFormat/app.config
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-  </startup>
-  <runtime>
-
-  <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -16,10 +11,14 @@
     <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
     <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.2.1.0" />
   </dependentAssembly>
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.1.2.0" />
+  </dependentAssembly>
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
     <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.1.0" />
   </dependentAssembly>
-</assemblyBinding></runtime>
-</configuration>
+</assemblyBinding></runtime></configuration>