Skip to content

Commit b4e18f6

Browse files
T-GroT-Gro
authored
Merge branch 'release/dev17.8' into merges/release/dev17.7-to-release/dev17.8
2 parents 67d3bb9 + f1c4f5c commit b4e18f6

File tree

1,468 files changed

+49506
-22844
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,468 files changed

+49506
-22844
lines changed

‎.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
44
#-------------------------------------------------------------------------------------------------------------
55

6-
ARG VARIANT=7.0.203-bullseye-slim-amd64
6+
ARG VARIANT=8.0.100-rc.1-bookworm-slim-amd64
77
FROM mcr.microsoft.com/dotnet/sdk:${VARIANT}
88

99
# Avoid warnings by switching to noninteractive

‎.devcontainer/devcontainer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
22
{
3-
"name": "F# (.NET 7)",
3+
"name": "F# (.NET 8)",
44
"build": {
55
"dockerfile": "Dockerfile",
66
"args": {
7-
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0, 7.0
7+
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0, 7.0, 8.0, etc.
88
// Append -bullseye(-slim), -focal, or -jammy to pin to an OS version.
9-
"VARIANT": "7.0.203-bullseye-slim-amd64"
9+
"VARIANT": "8.0.100-rc.1-bookworm-slim-amd64"
1010
}
1111
},
1212
"hostRequirements": {

‎.github/workflows/add_to_project.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,6 @@ jobs:
3030
gh api -X GET "$_UrlPath/$_CurrentWorkflowID/runs" --paginate \
3131
| jq '.workflow_runs[] | select(.status == "completed") | .id' \
3232
| xargs -I{} gh api -X DELETE "/repos/$GITHUB_REPOSITORY/actions/runs"/{}
33-
add_to_project:
34-
name: Add issue to project
35-
runs-on: ubuntu-latest
36-
permissions:
37-
issues: write
38-
repository-projects: write
39-
steps:
40-
- uses: actions/[email protected]
41-
with:
42-
project-url: https://github.com/orgs/dotnet/projects/126/
43-
github-token: ${{ secrets.REPO_PROJECT_PAT }}
4433
apply-label:
4534
runs-on: ubuntu-latest
4635
if: github.event_name != 'pull_request_target'

‎.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// TODO: Shall we assume that it's already been built, or build it every time we debug?
2424
// "preLaunchTask": "Build (Debug)",
2525
// If you have changed target frameworks, make sure to update the program p
26-
"program": "${workspaceFolder}/artifacts/bin/fsi/Debug/net7.0/fsi.dll",
26+
"program": "${workspaceFolder}/artifacts/bin/fsi/Debug/net8.0/fsi.dll",
2727
"args": [
2828
"${input:fsiArgsPrompt}"
2929
],
@@ -52,7 +52,7 @@
5252
// TODO: Shall we assume that it's already been built, or build it every time we debug?
5353
// "preLaunchTask": "Build (Debug)",
5454
// If you have changed target frameworks, make sure to update the program path.
55-
"program": "${workspaceFolder}/artifacts/bin/fsc/Debug/net7.0/fsc.dll",
55+
"program": "${workspaceFolder}/artifacts/bin/fsc/Debug/net8.0/fsc.dll",
5656
"args": [
5757
"${input:fscArgsPrompt}"
5858
],

‎.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"csharp.suppressDotnetRestoreNotification": true,
3737
"csharp.suppressHiddenDiagnostics": true,
3838
"omnisharp.autoStart": false,
39-
"omnisharp.defaultLaunchSolution": "FSharp.Compiler.Service.sln",
4039
"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
4140
"omnisharp.disableMSBuildDiagnosticWarning": true,
4241
"omnisharp.enableRoslynAnalyzers": false,
@@ -53,5 +52,6 @@
5352
"front_matter_title": ""
5453
}
5554
},
56-
"editor.inlayHints.enabled": "offUnlessPressed"
55+
"editor.inlayHints.enabled": "offUnlessPressed",
56+
"dotnet.defaultSolution": "FSharp.Compiler.Service.sln"
5757
}

‎DEVGUIDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ To use your custom build of `Fsc`, add the `DotnetFscCompilerPath` property to y
130130

131131
```xml
132132
<PropertyGroup>
133-
<DotnetFscCompilerPath>D:\Git\fsharp\artifacts\bin\fsc\Debug\net7.0\fsc.dll</DotnetFscCompilerPath>
133+
<DotnetFscCompilerPath>D:\Git\fsharp\artifacts\bin\fsc\Debug\net8.0\fsc.dll</DotnetFscCompilerPath>
134134
</PropertyGroup>
135135
```
136136

‎Directory.Build.props

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<Project>
22

33
<PropertyGroup>
4+
<LangVersion Condition="'$(FSharpLangVersion)' != ''">$(FSharpLangVersion)</LangVersion>
45
<RepoRoot Condition="'$(RepoRoot)' == ''">$(MSBuildThisFileDirectory)</RepoRoot>
6+
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
57
</PropertyGroup>
68
<!--
79
When developers load the FSharp.Compiler.Service solution we set FSHARPCORE_USE_PACKAGE to true if it hasn't already been set to a value.
@@ -28,8 +30,8 @@
2830
<ArtifactsDir>$(MSBuildThisFileDirectory)artifacts/</ArtifactsDir>
2931
<OutputPath>$(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/</OutputPath>
3032
<IntermediateOutputPath>$(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/</IntermediateOutputPath>
31-
<FsLexPath>$(ArtifactsDir)/bin/fslex/$(Configuration)/net7.0/fslex.dll</FsLexPath>
32-
<FsYaccPath>$(ArtifactsDir)/bin/fsyacc/$(Configuration)/net7.0/fsyacc.dll</FsYaccPath>
33+
<FsLexPath>$(ArtifactsDir)/bin/fslex/$(Configuration)/net8.0/fslex.dll</FsLexPath>
34+
<FsYaccPath>$(ArtifactsDir)/bin/fsyacc/$(Configuration)/net8.0/fsyacc.dll</FsYaccPath>
3335
</PropertyGroup>
3436

3537
<Import Project="$(MSBuildThisFileDirectory)/eng/Versions.props" Condition="'$(DISABLE_ARCADE)' == 'true'"/>

‎FSharp.Compiler.Service.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Core", "src\FSharp.C
5959
EndProject
6060
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Interactive.Settings", "src\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj", "{AF887C2E-640D-4CD6-A0BD-88AE1517797D}"
6161
EndProject
62+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.UnitTests", "tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj", "{0C0BDAF4-7D47-4BDA-9992-077F63D6B494}"
63+
EndProject
6264
Global
6365
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6466
Debug|Any CPU = Debug|Any CPU
@@ -137,6 +139,10 @@ Global
137139
{AF887C2E-640D-4CD6-A0BD-88AE1517797D}.Debug|Any CPU.Build.0 = Debug|Any CPU
138140
{AF887C2E-640D-4CD6-A0BD-88AE1517797D}.Release|Any CPU.ActiveCfg = Release|Any CPU
139141
{AF887C2E-640D-4CD6-A0BD-88AE1517797D}.Release|Any CPU.Build.0 = Release|Any CPU
142+
{0C0BDAF4-7D47-4BDA-9992-077F63D6B494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143+
{0C0BDAF4-7D47-4BDA-9992-077F63D6B494}.Debug|Any CPU.Build.0 = Debug|Any CPU
144+
{0C0BDAF4-7D47-4BDA-9992-077F63D6B494}.Release|Any CPU.ActiveCfg = Release|Any CPU
145+
{0C0BDAF4-7D47-4BDA-9992-077F63D6B494}.Release|Any CPU.Build.0 = Release|Any CPU
140146
EndGlobalSection
141147
GlobalSection(SolutionProperties) = preSolution
142148
HideSolutionNode = FALSE

‎FSharp.Editor.sln

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.VS.FSI", "vsintegrat
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FSharp.Editor.IntegrationTests", "vsintegration\tests\FSharp.Editor.IntegrationTests\FSharp.Editor.IntegrationTests.csproj", "{42BE0F2F-BC45-437B-851D-E88A83201339}"
2121
EndProject
22+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Test.Utilities", "tests\FSharp.Test.Utilities\FSharp.Test.Utilities.fsproj", "{B7148170-93C5-4F2F-B31D-85316D3248CF}"
23+
EndProject
2224
Global
2325
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2426
Debug|Any CPU = Debug|Any CPU
@@ -73,6 +75,12 @@ Global
7375
{42BE0F2F-BC45-437B-851D-E88A83201339}.Proto|Any CPU.Build.0 = Debug|Any CPU
7476
{42BE0F2F-BC45-437B-851D-E88A83201339}.Release|Any CPU.ActiveCfg = Release|Any CPU
7577
{42BE0F2F-BC45-437B-851D-E88A83201339}.Release|Any CPU.Build.0 = Release|Any CPU
78+
{B7148170-93C5-4F2F-B31D-85316D3248CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79+
{B7148170-93C5-4F2F-B31D-85316D3248CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
80+
{B7148170-93C5-4F2F-B31D-85316D3248CF}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
81+
{B7148170-93C5-4F2F-B31D-85316D3248CF}.Proto|Any CPU.Build.0 = Debug|Any CPU
82+
{B7148170-93C5-4F2F-B31D-85316D3248CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
83+
{B7148170-93C5-4F2F-B31D-85316D3248CF}.Release|Any CPU.Build.0 = Release|Any CPU
7684
EndGlobalSection
7785
GlobalSection(SolutionProperties) = preSolution
7886
HideSolutionNode = FALSE

‎FSharp.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ EndProject
103103
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D58BFE8B-7C85-4D3B-B5F3-9A7BB90FF1EE}"
104104
ProjectSection(SolutionItems) = preProject
105105
src\Compiler\FSComp.txt = src\Compiler\FSComp.txt
106+
src\Compiler\FSCompCheck.fsx = src\Compiler\FSCompCheck.fsx
106107
EndProjectSection
107108
EndProject
108109
Global

0 commit comments

Comments
 (0)