Skip to content

Update to .NET8 and latest FSharp.Core #16350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 8, 2023
Merged

Update to .NET8 and latest FSharp.Core #16350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98d4fba
Update to .NET8 and latest FSharp.Core
vzarytovskii Nov 28, 2023
9e92665
Merge branch 'main' into net8release
vzarytovskii Nov 28, 2023
5f01a88
Update to .NET8 and latest FSharp.Core
vzarytovskii Nov 28, 2023
72f0a81
Merge remote-tracking branch 'upstream/main' into net8release
vzarytovskii Nov 28, 2023
5a16eb8
Merge branch 'net8release' of https://github.com/vzarytovskii/fsharp …
vzarytovskii Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"id": "fscArgsPrompt",
"description": "Enter arguments for fsc",
"default": "",
"type": "promptString",
"type": "promptString"
},
{
"id": "fsiArgsPrompt",
Expand All @@ -17,7 +17,7 @@
],
"configurations": [
{
"name": "Launch FSI (Debug, .NET 7.0)",
"name": "Launch FSI (Debug)",
"type": "coreclr",
"request": "launch",
// TODO: Shall we assume that it's already been built, or build it every time we debug?
Expand All @@ -27,7 +27,7 @@
"args": [
"${input:fsiArgsPrompt}"
],
"cwd": "${workspaceFolder}/src",
"cwd": "${workspaceFolder}",
"console": "integratedTerminal", // This is the default to be able to run in Codespaces.
"internalConsoleOptions": "neverOpen",
"suppressJITOptimizations": true,
Expand All @@ -44,9 +44,10 @@
"enabled": true
}
},
"allowFastEvaluate": true
},
{
"name": "Launch FSC (Debug, .NET 7.0)",
"name": "Launch FSC (Debug)",
"type": "coreclr",
"request": "launch",
// TODO: Shall we assume that it's already been built, or build it every time we debug?
Expand All @@ -73,6 +74,7 @@
"enabled": true
}
},
"allowFastEvaluate": true
},
{
"name": "Attach to a .NET process",
Expand All @@ -86,7 +88,8 @@
},
"justMyCode": true,
"enableStepFiltering": false,
"requireExactSource": false
"requireExactSource": false,
"allowFastEvaluate": true
}
]
}
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<FSCoreReleaseNotesVersion>$(FSMajorVersion)-$(FSMinorVersion)-$(FSBuildVersion)</FSCoreReleaseNotesVersion>
<FSCoreVersionPrefix>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion)</FSCoreVersionPrefix>
<FSCoreVersion>$(FSMajorVersion).$(FSMinorVersion).0.0</FSCoreVersion>
<FSCoreShippedVersion>7.0.0.0</FSCoreShippedVersion>
<FSCoreShippedVersion>8.0.0.0</FSCoreShippedVersion>
<!-- -->
<!-- FSharp.Compiler.Service version -->
<FCSMajorVersion>43</FCSMajorVersion>
Expand All @@ -41,7 +41,7 @@
<FSharpCompilerServiceReleaseNotesVersion>$(FCSMajorVersion)$(FCSMinorVersion)$(FCSBuildVersion)</FSharpCompilerServiceReleaseNotesVersion>
<!-- -->
<!-- The current published nuget package -->
<FSharpCoreShippedPackageVersionValue>7.0.0</FSharpCoreShippedPackageVersionValue>
<FSharpCoreShippedPackageVersionValue>8.0.100</FSharpCoreShippedPackageVersionValue>
<!-- -->
<!-- The pattern for specifying the preview package -->
<FSharpCorePreviewPackageVersionValue>$(FSCorePackageVersionValue)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersionValue>
Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"sdk": {
"version": "8.0.100-rc.1.23463.5",
"version": "8.0.100",
"allowPrerelease": true
},
"tools": {
"dotnet": "8.0.100-rc.1.23463.5",
"dotnet": "8.0.100",
"vs": {
"version": "17.6",
"version": "17.8",
"components": [
"Microsoft.VisualStudio.Component.FSharp"
]
},
"xcopy-msbuild": "17.7.2"
"xcopy-msbuild": "17.8.1-2"
},
"native-tools": {
"perl": "5.38.0.1"
Expand Down