Skip to content

Commit c919b24

Browse files
nojafnojaf
authored
Merge pull request #832 from nojaf/fcs-7.0.400
FCS 43.7.400
2 parents bbeec25 + f5b4eed commit c919b24

File tree

26 files changed

+605
-614
lines changed

26 files changed

+605
-614
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<!-- Copy all project dependencies to bin folder -->
77
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9-
<OtherFlags>/warnon:1182</OtherFlags>
9+
<OtherFlags>$(OtherFlags) /warnon:1182 --test:GraphBasedChecking --test:ParallelOptimization --test:ParallelIlxGen</OtherFlags>
1010
</PropertyGroup>
1111

1212
<!-- NuGet Metadata -->

‎Directory.Packages.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66
</PropertyGroup>
77
<ItemGroup>
88
<!-- locking the version of F# Core as FCS does this anyway and in practise all will be using the same version -->
9-
<PackageVersion Include="FSharp.Core" Version="[7.0.200]" />
10-
<PackageVersion Include="FSharp.Compiler.Service" Version="[43.7.200]" />
9+
<PackageVersion Include="FSharp.Core" Version="[7.0.400]" />
10+
<PackageVersion Include="FSharp.Compiler.Service" Version="[43.7.400]" />
1111
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
1212
<PackageVersion Include="Microsoft.Build" Version="" PrivateAssets="all" />
1313
<PackageVersion Include="Microsoft.Build.Framework" Version="" PrivateAssets="all" />
1414
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="" PrivateAssets="all" />
1515
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="" PrivateAssets="all" />
16-
<PackageVersion Include="Ionide.ProjInfo" Version="0.61.2" />
17-
<PackageVersion Include="Ionide.ProjInfo.Sln" Version="0.61.2" />
18-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
16+
<PackageVersion Include="Ionide.ProjInfo" Version="0.62.0" />
17+
<PackageVersion Include="Ionide.ProjInfo.Sln" Version="0.62.0" />
18+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
1919
<PackageVersion Include="Suave" Version="2.6.2" />
2020
<PackageVersion Include="System.Memory" Version="4.5.5" />
21-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0-3.final" />
21+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
2222
<PackageVersion Include="NUnit" Version="3.13.3" />
23-
<PackageVersion Include="FsUnit" Version="5.2.0" />
24-
<PackageVersion Include="FSharp.Data" Version="6.1.1-beta" />
25-
<PackageVersion Include="NUnit3TestAdapter" Version="4.4.2" />
26-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5" />
23+
<PackageVersion Include="FsUnit" Version="5.4.0" />
24+
<PackageVersion Include="FSharp.Data" Version="6.2.0" />
25+
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
26+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
2727
</ItemGroup>
2828
</Project>

‎RELEASE_NOTES.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 19.0.0
2+
3+
* Update FCS to 43.7.400
4+
15
## 18.1.1
26

37
* Pass `--multiemit-` as default option for `FsiEvaluator`.

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "7.0.304",
3+
"version": "7.0.400",
44
"rollForward": "minor"
55
}
66
}

‎src/FSharp.Formatting.ApiDocs/packages.lock.json‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
".NETStandard,Version=v2.1": {
55
"FSharp.Compiler.Service": {
66
"type": "Direct",
7-
"requested": "[43.7.200, 43.7.200]",
8-
"resolved": "43.7.200",
9-
"contentHash": "RpO8Ly7mTRGnZANzjKMDsxsrkpVyyPP3d211+95TBVrDh5XU8LS+F/tPsJ9y+10kphzOmplZ9xaEc44OtveWzw==",
7+
"requested": "[43.7.400, 43.7.400]",
8+
"resolved": "43.7.400",
9+
"contentHash": "lg3iNkZMvuj9hOxSJ0TM1/ntcFDPRQgr1+e4bLj/avNX3FkpUtPrzCRNRpy0VP8UCNa362al5NGkVWiihxjeUQ==",
1010
"dependencies": {
11-
"FSharp.Core": "[7.0.200]",
11+
"FSharp.Core": "[7.0.400]",
1212
"System.Buffers": "4.5.1",
13-
"System.Collections.Immutable": "6.0.0",
14-
"System.Diagnostics.DiagnosticSource": "6.0.0",
13+
"System.Collections.Immutable": "7.0.0",
14+
"System.Diagnostics.DiagnosticSource": "7.0.2",
1515
"System.Memory": "4.5.5",
1616
"System.Reflection.Emit": "4.7.0",
17-
"System.Reflection.Metadata": "6.0.0",
17+
"System.Reflection.Metadata": "7.0.0",
1818
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
1919
}
2020
},
2121
"FSharp.Core": {
2222
"type": "Direct",
23-
"requested": "[7.0.200, 7.0.200]",
24-
"resolved": "7.0.200",
25-
"contentHash": "NmgUnpNH6Zu9B0SPIhojyo38gnPdkdYFYQfbd6zosEH32kbGY/g/Klk7PfOWe1NAe/O1YOMmK9KhwQ2OWsWEbg=="
23+
"requested": "[7.0.400, 7.0.400]",
24+
"resolved": "7.0.400",
25+
"contentHash": "kJQ7TBQqd1d2VoODSgwFSAaApaBN0Fuu8mZt2XExmd3UzUxLjUsMn5Y5XhpsUWdnxOL8amp7VFg7cwhPllR4Qw=="
2626
},
2727
"System.Buffers": {
2828
"type": "Transitive",
@@ -31,19 +31,19 @@
3131
},
3232
"System.Collections.Immutable": {
3333
"type": "Transitive",
34-
"resolved": "6.0.0",
35-
"contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==",
34+
"resolved": "7.0.0",
35+
"contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==",
3636
"dependencies": {
37-
"System.Memory": "4.5.4",
37+
"System.Memory": "4.5.5",
3838
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
3939
}
4040
},
4141
"System.Diagnostics.DiagnosticSource": {
4242
"type": "Transitive",
43-
"resolved": "6.0.0",
44-
"contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
43+
"resolved": "7.0.2",
44+
"contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==",
4545
"dependencies": {
46-
"System.Memory": "4.5.4",
46+
"System.Memory": "4.5.5",
4747
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
4848
}
4949
},
@@ -59,10 +59,11 @@
5959
},
6060
"System.Reflection.Metadata": {
6161
"type": "Transitive",
62-
"resolved": "6.0.0",
63-
"contentHash": "sffDOcex1C3HO5kDolOYcWXTwRpZY/LvJujM6SMjn63fWMJWchYAAmkoAJXlbpZ5yf4d+KMgxd+LeETa4gD9sQ==",
62+
"resolved": "7.0.0",
63+
"contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==",
6464
"dependencies": {
65-
"System.Collections.Immutable": "6.0.0"
65+
"System.Collections.Immutable": "7.0.0",
66+
"System.Memory": "4.5.5"
6667
}
6768
},
6869
"System.Runtime.CompilerServices.Unsafe": {
@@ -73,30 +74,30 @@
7374
"fsharp.formatting.codeformat": {
7475
"type": "Project",
7576
"dependencies": {
76-
"FSharp.Compiler.Service": "[43.7.200, 43.7.200]",
77-
"FSharp.Core": "[7.0.200, 7.0.200]",
78-
"FSharp.Formatting.Common": "[18.1.0, )"
77+
"FSharp.Compiler.Service": "[43.7.400, 43.7.400]",
78+
"FSharp.Core": "[7.0.400, 7.0.400]",
79+
"FSharp.Formatting.Common": "[18.1.1, )"
7980
}
8081
},
8182
"fsharp.formatting.common": {
8283
"type": "Project",
8384
"dependencies": {
84-
"FSharp.Compiler.Service": "[43.7.200, 43.7.200]",
85-
"FSharp.Core": "[7.0.200, 7.0.200]"
85+
"FSharp.Compiler.Service": "[43.7.400, 43.7.400]",
86+
"FSharp.Core": "[7.0.400, 7.0.400]"
8687
}
8788
},
8889
"fsharp.formatting.literate": {
8990
"type": "Project",
9091
"dependencies": {
91-
"FSharp.Compiler.Service": "[43.7.200, 43.7.200]",
92-
"FSharp.Core": "[7.0.200, 7.0.200]"
92+
"FSharp.Compiler.Service": "[43.7.400, 43.7.400]",
93+
"FSharp.Core": "[7.0.400, 7.0.400]"
9394
}
9495
},
9596
"fsharp.formatting.markdown": {
9697
"type": "Project",
9798
"dependencies": {
98-
"FSharp.Core": "[7.0.200, 7.0.200]",
99-
"FSharp.Formatting.Common": "[18.1.0, )"
99+
"FSharp.Core": "[7.0.400, 7.0.400]",
100+
"FSharp.Formatting.Common": "[18.1.1, )"
100101
}
101102
},
102103
"System.Memory": {

‎src/FSharp.Formatting.CodeFormat/CodeFormatAgent.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ module private Helpers =
7979
s.Split([| ' '; ';'; ',' |], StringSplitOptions.RemoveEmptyEntries)
8080
|> List.ofSeq)
8181
// Create source tokenizer
82-
let sourceTok = FSharpSourceTokenizer(defaultArg defines [], file)
82+
let sourceTok = FSharpSourceTokenizer(defaultArg defines [], file, None)
8383

8484
// Parse lines using the tokenizer
8585
let indexedSnippetLines =

‎src/FSharp.Formatting.CodeFormat/packages.lock.json‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
".NETStandard,Version=v2.1": {
55
"FSharp.Compiler.Service": {
66
"type": "Direct",
7-
"requested": "[43.7.200, 43.7.200]",
8-
"resolved": "43.7.200",
9-
"contentHash": "RpO8Ly7mTRGnZANzjKMDsxsrkpVyyPP3d211+95TBVrDh5XU8LS+F/tPsJ9y+10kphzOmplZ9xaEc44OtveWzw==",
7+
"requested": "[43.7.400, 43.7.400]",
8+
"resolved": "43.7.400",
9+
"contentHash": "lg3iNkZMvuj9hOxSJ0TM1/ntcFDPRQgr1+e4bLj/avNX3FkpUtPrzCRNRpy0VP8UCNa362al5NGkVWiihxjeUQ==",
1010
"dependencies": {
11-
"FSharp.Core": "[7.0.200]",
11+
"FSharp.Core": "[7.0.400]",
1212
"System.Buffers": "4.5.1",
13-
"System.Collections.Immutable": "6.0.0",
14-
"System.Diagnostics.DiagnosticSource": "6.0.0",
13+
"System.Collections.Immutable": "7.0.0",
14+
"System.Diagnostics.DiagnosticSource": "7.0.2",
1515
"System.Memory": "4.5.5",
1616
"System.Reflection.Emit": "4.7.0",
17-
"System.Reflection.Metadata": "6.0.0",
17+
"System.Reflection.Metadata": "7.0.0",
1818
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
1919
}
2020
},
2121
"FSharp.Core": {
2222
"type": "Direct",
23-
"requested": "[7.0.200, 7.0.200]",
24-
"resolved": "7.0.200",
25-
"contentHash": "NmgUnpNH6Zu9B0SPIhojyo38gnPdkdYFYQfbd6zosEH32kbGY/g/Klk7PfOWe1NAe/O1YOMmK9KhwQ2OWsWEbg=="
23+
"requested": "[7.0.400, 7.0.400]",
24+
"resolved": "7.0.400",
25+
"contentHash": "kJQ7TBQqd1d2VoODSgwFSAaApaBN0Fuu8mZt2XExmd3UzUxLjUsMn5Y5XhpsUWdnxOL8amp7VFg7cwhPllR4Qw=="
2626
},
2727
"System.Buffers": {
2828
"type": "Transitive",
@@ -31,19 +31,19 @@
3131
},
3232
"System.Collections.Immutable": {
3333
"type": "Transitive",
34-
"resolved": "6.0.0",
35-
"contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==",
34+
"resolved": "7.0.0",
35+
"contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==",
3636
"dependencies": {
37-
"System.Memory": "4.5.4",
37+
"System.Memory": "4.5.5",
3838
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
3939
}
4040
},
4141
"System.Diagnostics.DiagnosticSource": {
4242
"type": "Transitive",
43-
"resolved": "6.0.0",
44-
"contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
43+
"resolved": "7.0.2",
44+
"contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==",
4545
"dependencies": {
46-
"System.Memory": "4.5.4",
46+
"System.Memory": "4.5.5",
4747
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
4848
}
4949
},
@@ -59,10 +59,11 @@
5959
},
6060
"System.Reflection.Metadata": {
6161
"type": "Transitive",
62-
"resolved": "6.0.0",
63-
"contentHash": "sffDOcex1C3HO5kDolOYcWXTwRpZY/LvJujM6SMjn63fWMJWchYAAmkoAJXlbpZ5yf4d+KMgxd+LeETa4gD9sQ==",
62+
"resolved": "7.0.0",
63+
"contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==",
6464
"dependencies": {
65-
"System.Collections.Immutable": "6.0.0"
65+
"System.Collections.Immutable": "7.0.0",
66+
"System.Memory": "4.5.5"
6667
}
6768
},
6869
"System.Runtime.CompilerServices.Unsafe": {
@@ -73,8 +74,8 @@
7374
"fsharp.formatting.common": {
7475
"type": "Project",
7576
"dependencies": {
76-
"FSharp.Compiler.Service": "[43.7.200, 43.7.200]",
77-
"FSharp.Core": "[7.0.200, 7.0.200]"
77+
"FSharp.Compiler.Service": "[43.7.400, 43.7.400]",
78+
"FSharp.Core": "[7.0.400, 7.0.400]"
7879
}
7980
},
8081
"System.Memory": {

‎src/FSharp.Formatting.Common/packages.lock.json‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
".NETStandard,Version=v2.1": {
55
"FSharp.Compiler.Service": {
66
"type": "Direct",
7-
"requested": "[43.7.200, 43.7.200]",
8-
"resolved": "43.7.200",
9-
"contentHash": "RpO8Ly7mTRGnZANzjKMDsxsrkpVyyPP3d211+95TBVrDh5XU8LS+F/tPsJ9y+10kphzOmplZ9xaEc44OtveWzw==",
7+
"requested": "[43.7.400, 43.7.400]",
8+
"resolved": "43.7.400",
9+
"contentHash": "lg3iNkZMvuj9hOxSJ0TM1/ntcFDPRQgr1+e4bLj/avNX3FkpUtPrzCRNRpy0VP8UCNa362al5NGkVWiihxjeUQ==",
1010
"dependencies": {
11-
"FSharp.Core": "[7.0.200]",
11+
"FSharp.Core": "[7.0.400]",
1212
"System.Buffers": "4.5.1",
13-
"System.Collections.Immutable": "6.0.0",
14-
"System.Diagnostics.DiagnosticSource": "6.0.0",
13+
"System.Collections.Immutable": "7.0.0",
14+
"System.Diagnostics.DiagnosticSource": "7.0.2",
1515
"System.Memory": "4.5.5",
1616
"System.Reflection.Emit": "4.7.0",
17-
"System.Reflection.Metadata": "6.0.0",
17+
"System.Reflection.Metadata": "7.0.0",
1818
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
1919
}
2020
},
2121
"FSharp.Core": {
2222
"type": "Direct",
23-
"requested": "[7.0.200, 7.0.200]",
24-
"resolved": "7.0.200",
25-
"contentHash": "NmgUnpNH6Zu9B0SPIhojyo38gnPdkdYFYQfbd6zosEH32kbGY/g/Klk7PfOWe1NAe/O1YOMmK9KhwQ2OWsWEbg=="
23+
"requested": "[7.0.400, 7.0.400]",
24+
"resolved": "7.0.400",
25+
"contentHash": "kJQ7TBQqd1d2VoODSgwFSAaApaBN0Fuu8mZt2XExmd3UzUxLjUsMn5Y5XhpsUWdnxOL8amp7VFg7cwhPllR4Qw=="
2626
},
2727
"System.Buffers": {
2828
"type": "Transitive",
@@ -31,19 +31,19 @@
3131
},
3232
"System.Collections.Immutable": {
3333
"type": "Transitive",
34-
"resolved": "6.0.0",
35-
"contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==",
34+
"resolved": "7.0.0",
35+
"contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==",
3636
"dependencies": {
37-
"System.Memory": "4.5.4",
37+
"System.Memory": "4.5.5",
3838
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
3939
}
4040
},
4141
"System.Diagnostics.DiagnosticSource": {
4242
"type": "Transitive",
43-
"resolved": "6.0.0",
44-
"contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
43+
"resolved": "7.0.2",
44+
"contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==",
4545
"dependencies": {
46-
"System.Memory": "4.5.4",
46+
"System.Memory": "4.5.5",
4747
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
4848
}
4949
},
@@ -59,10 +59,11 @@
5959
},
6060
"System.Reflection.Metadata": {
6161
"type": "Transitive",
62-
"resolved": "6.0.0",
63-
"contentHash": "sffDOcex1C3HO5kDolOYcWXTwRpZY/LvJujM6SMjn63fWMJWchYAAmkoAJXlbpZ5yf4d+KMgxd+LeETa4gD9sQ==",
62+
"resolved": "7.0.0",
63+
"contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==",
6464
"dependencies": {
65-
"System.Collections.Immutable": "6.0.0"
65+
"System.Collections.Immutable": "7.0.0",
66+
"System.Memory": "4.5.5"
6667
}
6768
},
6869
"System.Runtime.CompilerServices.Unsafe": {

0 commit comments

Comments
 (0)