Update to FCS35

.paket/Paket.Restore.targets

@@ -27,10 +27,16 @@
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExeDir Condition=" Exists('$(PaketBootStrapperExePath)') " >$([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\</PaketBootStrapperExeDir>
-    
+
     <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT' ">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
     <PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
 
+    <!-- Disable automagic references for F# DotNet SDK -->
+    <!-- This will not do anything for other project types -->
+    <!-- see https://github.com/fsharp/fslang-design/blob/master/tooling/FST-1002-fsharp-in-dotnet-sdk.md -->
+    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+    <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
+
     <!-- Disable Paket restore under NCrunch build -->
     <PaketRestoreDisabled Condition="'$(NCrunch)' == '1'">True</PaketRestoreDisabled>
 
@@ -130,7 +136,7 @@
         <!-- Parse our simple 'paket.restore.cached' json ...-->
         <PaketRestoreCachedSplitObject Include="$([System.Text.RegularExpressions.Regex]::Split(`$(PaketRestoreCachedContents)`, `{|}|,`))"></PaketRestoreCachedSplitObject>
         <!-- Keep Key, Value ItemGroup-->
-        <PaketRestoreCachedKeyValue Include="@(PaketRestoreCachedSplitObject)" 
+        <PaketRestoreCachedKeyValue Include="@(PaketRestoreCachedSplitObject)"
             Condition=" $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `&quot;: &quot;`).Length) &gt; 1 ">
           <Key>$([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[0].Replace(`"`, ``).Replace(` `, ``))</Key>
           <Value>$([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[1].Replace(`"`, ``).Replace(` `, ``))</Value>
@@ -163,7 +169,7 @@
     <Exec Command='$(PaketBootStrapperCommand)' Condition=" '$(PaketBootstrapperStyle)' == 'classic' AND Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
     <Error Text="Stop build because of PAKET_ERROR_ON_MSBUILD_EXEC and we need a full restore (hashes don't match)" Condition=" '$(PAKET_ERROR_ON_MSBUILD_EXEC)' == 'true' AND '$(PaketRestoreRequired)' == 'true' AND '$(PaketDisableGlobalRestore)' != 'true'" />
     <Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(PaketDisableGlobalRestore)' != 'true' " ContinueOnError="false" />
-    
+
     <!-- Step 2 Detect project specific changes -->
     <ItemGroup>
       <MyTargetFrameworks Condition="'$(TargetFramework)' != '' " Include="$(TargetFramework)"></MyTargetFrameworks>

azure-pipelines.yml

@@ -8,6 +8,11 @@ jobs:
     displayName: 'Use .NET Core Sdk from global.json'
     inputs:
       useGlobalJson: true
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core Sdk 2.1 to support paket git dependencies'
+    inputs:
+      packageType: sdk
+      version: 2.1.x
   - script: dotnet tool restore
     displayName: Install Tools
   - script: dotnet fake build --target All
@@ -24,6 +29,11 @@ jobs:
 #     displayName: 'Use .NET Core Sdk from global.json'
 #     inputs:
 #       useGlobalJson: true
+#   - task: UseDotNet@2
+#     displayName: 'Use .NET Core Sdk 2.1 to support paket git dependencies'
+#     inputs:
+#       packageType: sdk
+#       version: 2.1.x
 #   - script: dotnet tool restore
 #     displayName: Install Tools
 #   - script: dotnet fake build --target All
@@ -36,6 +46,11 @@ jobs:
     displayName: 'Use .NET Core Sdk from global.json'
     inputs:
       useGlobalJson: true
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core Sdk 2.1 to support paket git dependencies'
+    inputs:
+      packageType: sdk
+      version: 2.1.x
   - script: dotnet tool restore
     displayName: Install Tools
   - script: dotnet fake build --target All

paket.dependencies

@@ -1,15 +1,20 @@
 version 5.241.6
 
 framework: net461, netstandard2.0, netcoreapp2.1
+
 source https://api.nuget.org/v3/index.json
-source ./lib
+git https://github.com/ionide/fantomas.git master build: "build.sh -t Pack", Packages: ./bin, OS: mac
+git https://github.com/ionide/fantomas.git master build: "build.cmd -t Pack", Packages: ./bin, OS: win
+git https://github.com/baronfel/FSharpLint.git pass-version build: "build.sh -t Package", Packages: ./packaging, OS: mac
+git https://github.com/baronfel/FSharpLint.git pass-version build: "build.cmd -t Package", Packages: ./packaging, OS: win
+
 storage: none
 
 github TheAngryByrd/FsLibLog:f81cba440bf0476bb4e2262b57a067a0d6ab78a7 src/FsLibLog/FsLibLog.fs
 
 nuget Argu ~> 5.2.0
-nuget Fantomas 3.3.0
-nuget FSharp.Compiler.Service 34.1.1
+nuget Fantomas prerelease
+nuget FSharp.Compiler.Service 35.0.0
 nuget Dotnet.ProjInfo
 nuget Dotnet.ProjInfo.Workspace.FCS
 nuget FSharp.Analyzers.SDK