Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into timespan_parse_try_parse
Browse files Browse the repository at this point in the history
  • Loading branch information
MangelMaxime committed Dec 10, 2023
2 parents 9f0a63e + ccee1e6 commit 2a07798
Show file tree
Hide file tree
Showing 201 changed files with 15,321 additions and 11,183 deletions.
18 changes: 9 additions & 9 deletions lib/fcs/FSharp.Compiler.Service.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"targets": {
".NETStandard,Version=v2.0": {},
".NETStandard,Version=v2.0/": {
"FSharp.Compiler.Service/43.8.100-dev": {
"FSharp.Compiler.Service/43.8.200-dev": {
"dependencies": {
"FSharp.Core": "8.0.100-dev",
"FSharp.DependencyManager.Nuget": "8.0.100-dev",
"FSharp.Core": "8.0.200-dev",
"FSharp.DependencyManager.Nuget": "8.0.200-dev",
"Microsoft.DotNet.XliffTasks": "1.0.0-beta.23426.1",
"NETStandard.Library": "2.0.3",
"System.Buffers": "4.5.1",
Expand Down Expand Up @@ -164,7 +164,7 @@
}
}
},
"FSharp.Core/8.0.100-dev": {
"FSharp.Core/8.0.200-dev": {
"runtime": {
"FSharp.Core.dll": {}
},
Expand Down Expand Up @@ -210,9 +210,9 @@
}
}
},
"FSharp.DependencyManager.Nuget/8.0.100-dev": {
"FSharp.DependencyManager.Nuget/8.0.200-dev": {
"dependencies": {
"FSharp.Core": "8.0.100-dev",
"FSharp.Core": "8.0.200-dev",
"System.Reflection.Emit": "4.7.0",
"System.Reflection.Metadata": "6.0.1",
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
Expand Down Expand Up @@ -265,7 +265,7 @@
}
},
"libraries": {
"FSharp.Compiler.Service/43.8.100-dev": {
"FSharp.Compiler.Service/43.8.200-dev": {
"type": "project",
"serviceable": false,
"sha512": ""
Expand Down Expand Up @@ -354,12 +354,12 @@
"path": "system.runtime.compilerservices.unsafe/6.0.0",
"hashPath": "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512"
},
"FSharp.Core/8.0.100-dev": {
"FSharp.Core/8.0.200-dev": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"FSharp.DependencyManager.Nuget/8.0.100-dev": {
"FSharp.DependencyManager.Nuget/8.0.200-dev": {
"type": "project",
"serviceable": false,
"sha512": ""
Expand Down
Binary file modified lib/fcs/FSharp.Compiler.Service.dll
Binary file not shown.
Loading

0 comments on commit 2a07798

Please sign in to comment.