Skip to content

Commit 85c477d

Browse files
committed
Updating FSAC + FSharp.Analyzers.SDK to latest versions
1 parent 2a3c775 commit 85c477d

5 files changed

Lines changed: 62 additions & 100 deletions

File tree

.paket/Paket.Restore.targets

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,16 @@
2727
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
2828
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
2929
<PaketBootStrapperExeDir Condition=" Exists('$(PaketBootStrapperExePath)') " >$([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\</PaketBootStrapperExeDir>
30-
30+
3131
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT' ">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
3232
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
3333

34+
<!-- Disable automagic references for F# DotNet SDK -->
35+
<!-- This will not do anything for other project types -->
36+
<!-- see https://github.com/fsharp/fslang-design/blob/master/tooling/FST-1002-fsharp-in-dotnet-sdk.md -->
37+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
38+
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
39+
3440
<!-- Disable Paket restore under NCrunch build -->
3541
<PaketRestoreDisabled Condition="'$(NCrunch)' == '1'">True</PaketRestoreDisabled>
3642

@@ -130,7 +136,7 @@
130136
<!-- Parse our simple 'paket.restore.cached' json ...-->
131137
<PaketRestoreCachedSplitObject Include="$([System.Text.RegularExpressions.Regex]::Split(`$(PaketRestoreCachedContents)`, `{|}|,`))"></PaketRestoreCachedSplitObject>
132138
<!-- Keep Key, Value ItemGroup-->
133-
<PaketRestoreCachedKeyValue Include="@(PaketRestoreCachedSplitObject)"
139+
<PaketRestoreCachedKeyValue Include="@(PaketRestoreCachedSplitObject)"
134140
Condition=" $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `&quot;: &quot;`).Length) &gt; 1 ">
135141
<Key>$([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[0].Replace(`"`, ``).Replace(` `, ``))</Key>
136142
<Value>$([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[1].Replace(`"`, ``).Replace(` `, ``))</Value>
@@ -163,7 +169,7 @@
163169
<Exec Command='$(PaketBootStrapperCommand)' Condition=" '$(PaketBootstrapperStyle)' == 'classic' AND Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
164170
<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'" />
165171
<Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(PaketDisableGlobalRestore)' != 'true' " ContinueOnError="false" />
166-
172+
167173
<!-- Step 2 Detect project specific changes -->
168174
<ItemGroup>
169175
<MyTargetFrameworks Condition="'$(TargetFramework)' != '' " Include="$(TargetFramework)"></MyTargetFrameworks>

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
- Introduced a `maybe` computational expression to simplify option types
1515
- Major refactor of the internals
1616
- Change analyzer to support using appsettings not just environment variables to find connection info
17+
- Bumped dependency for FSAC to 35.0.0
1718

1819
## [0.1.1] - 2020-03-13
1920

paket.dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source https://api.nuget.org/v3/index.json
44
storage: none
55

66
nuget FSharp.Analyzers.SDK
7-
nuget FSharp.Compiler.Service 34.1.1
7+
nuget FSharp.Compiler.Service 35.0.0
88
nuget Azure.Cosmos 4.0.0-preview3 preview
99
nuget FSharp.Control.AsyncSeq
1010
nuget System.Json

0 commit comments

Comments
 (0)