Skip to content

Commit 73371ac

Browse files
KevinRansomKevinRansom
authored
Merge branch 'release/dev17.4' into merges/release/dev17.3-to-release/dev17.4
2 parents 165bea4 + 753fc58 commit 73371ac

File tree

666 files changed

+32803
-19148
lines changed

Some content is hidden

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

666 files changed

+32803
-19148
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
"isRoot": true,
44
"tools": {
55
"fantomas": {
6-
"version": "5.0.0-alpha-008",
6+
"version": "5.0.0-beta-005",
77
"commands": [
88
"fantomas"
99
]
1010
}
1111
}
1212
}
13-

‎.devcontainer/Dockerfile‎

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

6-
ARG VARIANT=6.0-focal
7-
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
6+
ARG VARIANT=7.0-bullseye-slim
7+
FROM mcr.microsoft.com/dotnet/sdk:${VARIANT}
88

99
# Avoid warnings by switching to noninteractive
1010
ENV DEBIAN_FRONTEND=noninteractive

‎.devcontainer/devcontainer.json‎

Lines changed: 11 additions & 14 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 6)",
3+
"name": "F# (.NET 7)",
44
"build": {
55
"dockerfile": "Dockerfile",
66
"args": {
7-
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0
8-
// Append -bullseye or -focal to pin to an OS version.
9-
"VARIANT": "6.0-focal"
7+
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0, 7.0
8+
// Append -bullseye(-slim), -focal, or -jammy to pin to an OS version.
9+
"VARIANT": "7.0-bullseye-slim"
1010
}
1111
},
1212
"hostRequirements": {
@@ -20,19 +20,16 @@
2020

2121
// Add the IDs of extensions you want installed when the container is created.
2222
"extensions": [
23-
"ms-vscode.test-adapter-converter",
24-
"hbenl.vscode-test-explorer",
25-
"formulahendry.dotnet-test-explorer",
2623
"ms-dotnettools.csharp",
2724
"Ionide.Ionide-fsharp",
2825
"tintoy.msbuild-project-tools"
2926
],
30-
"onCreateCommand": [
31-
"/bin/bash",
32-
"-c",
33-
"./build.sh",
34-
"-c",
35-
"Debug"
36-
],
27+
//"onCreateCommand": [ // It is a bit buggy in codespaces, so for now, need to run it manually.
28+
// "/bin/bash",
29+
// "-c",
30+
// "./build.sh",
31+
// "-c",
32+
// "Debug"
33+
//],
3734
"waitFor": "onCreateCommand"
3835
}

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,3 +123,5 @@ nCrunchTemp_*
123123

124124
/test.fs
125125
/test.fsx
126+
127+
tests/FSharp.Compiler.Service.Tests/FSharp.CompilerService.SurfaceArea.netstandard.actual

‎.vscode/launch.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
// TODO: Shall we assume that it's already been built, or build it every time we debug?
1818
// "preLaunchTask": "Build (Debug)",
1919
// If you have changed target frameworks, make sure to update the program p
20-
"program": "${workspaceFolder}/artifacts/bin/fsi/Debug/net6.0/fsi.dll",
20+
"program": "${workspaceFolder}/artifacts/bin/fsi/Debug/net7.0/fsi.dll",
2121
"cwd": "${workspaceFolder}/src",
2222
"console": "integratedTerminal", // This is the default to be able to run in Codespaces.
2323
"internalConsoleOptions": "neverOpen",
2424
"suppressJITOptimizations": true,
2525
"stopAtEntry": false,
26-
"justMyCode": false,
26+
"justMyCode": true,
2727
"enableStepFiltering": true,
2828
"symbolOptions": {
2929
"searchMicrosoftSymbolServer": true,
@@ -42,7 +42,7 @@
4242
// TODO: Shall we assume that it's already been built, or build it every time we debug?
4343
// "preLaunchTask": "Build (Debug)",
4444
// If you have changed target frameworks, make sure to update the program path.
45-
"program": "${workspaceFolder}/artifacts/bin/fsc/Debug/net6.0/fsc.dll",
45+
"program": "${workspaceFolder}/artifacts/bin/fsc/Debug/net7.0/fsc.dll",
4646
"args": [
4747
"${input:argsPrompt}"
4848
],
@@ -73,7 +73,7 @@
7373
"enabled": true
7474
}
7575
},
76-
"justMyCode": false,
76+
"justMyCode": true,
7777
"enableStepFiltering": false,
7878
}
7979
]

‎.vscode/settings.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"*.fs": "${capture}.fsi"
1717
},
1818
"FSharp.suggestGitignore": false,
19-
"FSharp.enableMSBuildProjectGraph": false,
19+
"FSharp.enableMSBuildProjectGraph": true,
2020
"FSharp.workspacePath": "FSharp.Compiler.Service.sln",
2121
"FSharp.workspaceModePeekDeepLevel": 1,
2222
"FSharp.enableBackgroundServices": false,
@@ -34,7 +34,7 @@
3434
"csharp.suppressDotnetInstallWarning": true,
3535
"csharp.suppressDotnetRestoreNotification": true,
3636
"csharp.suppressHiddenDiagnostics": true,
37-
"omnisharp.autoStart": false,
37+
"omnisharp.autoStart": true,
3838
"omnisharp.defaultLaunchSolution": "FSharp.Compiler.Service.sln",
3939
"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
4040
"omnisharp.disableMSBuildDiagnosticWarning": true,
@@ -45,10 +45,6 @@
4545
"powershell.promptToUpdatePowerShell": false,
4646
"powershell.integratedConsole.showOnStartup": false,
4747
"powershell.startAutomatically": false,
48-
"dotnet-test-explorer.testProjectPath": "tests/+(FSharp.Compiler.Service.Tests|FSharp.Compiler.UnitTests|FSharp.Core.UnitTests|FSharp.Build.UnitTests|FSharp.Compiler.ComponentTests)/*Tests.fsproj",
49-
"dotnet-test-explorer.addProblems": true,
50-
"dotnet-test-explorer.autoWatch": false,
51-
"dotnet-test-explorer.treeMode": "merged",
5248
"testExplorer.useNativeTesting": true,
5349
"markdownlint.config": {
5450
"MD028": false,

‎Directory.Build.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@
33
<Import Project="FSharpBuild.Directory.Build.props" Condition = " '$(FSharpTestCompilerVersion)' == '' "/>
44
<Import Project="FSharpTests.Directory.Build.props" Condition = " '$(FSharpTestCompilerVersion)' != '' "/>
55

6+
<ItemGroup>
7+
<!-- If there is a README.md next to a project file, include it (for easier access in the IDE) -->
8+
<None Include="README.md" Condition="Exists('README.md')" />
9+
</ItemGroup>
10+
611
</Project>

‎FSharp.Compiler.Service.sln‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,19 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.ComponentTe
2222
{38A23D53-E2BF-4B76-907F-49F41D60C88E} = {38A23D53-E2BF-4B76-907F-49F41D60C88E}
2323
EndProjectSection
2424
EndProject
25+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks", "{AF321816-B4A0-41DD-9A1D-484E8A20C6F6}"
26+
ProjectSection(SolutionItems) = preProject
27+
tests\benchmarks\FCSBenchmarks\decentlySizedStandAloneFile.fs = tests\benchmarks\FCSBenchmarks\decentlySizedStandAloneFile.fs
28+
tests\benchmarks\FCSBenchmarks\README.md = tests\benchmarks\FCSBenchmarks\README.md
29+
tests\benchmarks\FCSBenchmarks\SmokeTestAllBenchmarks.ps1 = tests\benchmarks\FCSBenchmarks\SmokeTestAllBenchmarks.ps1
30+
EndProjectSection
31+
EndProject
32+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "HistoricalBenchmark", "tests\benchmarks\FCSBenchmarks\BenchmarkComparison\HistoricalBenchmark.fsproj", "{35F5F1C5-AE4F-4B5A-8D94-1AF708724FD5}"
33+
EndProject
34+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Benchmarks", "tests\benchmarks\FCSBenchmarks\CompilerServiceBenchmarks\FSharp.Compiler.Benchmarks.fsproj", "{C1950E28-1CB7-4DEC-BB3A-8A0443A17282}"
35+
EndProject
36+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "HistoricalBenchmark.Runner", "tests\benchmarks\FCSBenchmarks\BenchmarkComparison\HistoricalBenchmark.Runner\HistoricalBenchmark.Runner.fsproj", "{07CD957A-3C31-4F75-A735-16CE72E1BD71}"
37+
EndProject
2538
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DD4D4A7E-D519-4409-89DA-16DCA3EF80AA}"
2639
ProjectSection(SolutionItems) = preProject
2740
src\Compiler\FSComp.txt = src\Compiler\FSComp.txt
@@ -61,6 +74,18 @@ Global
6174
{2A182B7D-EDA3-4BF2-84B8-C7553BB7A5A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
6275
{2A182B7D-EDA3-4BF2-84B8-C7553BB7A5A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
6376
{2A182B7D-EDA3-4BF2-84B8-C7553BB7A5A7}.Release|Any CPU.Build.0 = Release|Any CPU
77+
{35F5F1C5-AE4F-4B5A-8D94-1AF708724FD5}.Debug|Any CPU.ActiveCfg = Release|Any CPU
78+
{35F5F1C5-AE4F-4B5A-8D94-1AF708724FD5}.Debug|Any CPU.Build.0 = Release|Any CPU
79+
{35F5F1C5-AE4F-4B5A-8D94-1AF708724FD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
80+
{35F5F1C5-AE4F-4B5A-8D94-1AF708724FD5}.Release|Any CPU.Build.0 = Release|Any CPU
81+
{C1950E28-1CB7-4DEC-BB3A-8A0443A17282}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
82+
{C1950E28-1CB7-4DEC-BB3A-8A0443A17282}.Debug|Any CPU.Build.0 = Debug|Any CPU
83+
{C1950E28-1CB7-4DEC-BB3A-8A0443A17282}.Release|Any CPU.ActiveCfg = Release|Any CPU
84+
{C1950E28-1CB7-4DEC-BB3A-8A0443A17282}.Release|Any CPU.Build.0 = Release|Any CPU
85+
{07CD957A-3C31-4F75-A735-16CE72E1BD71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
86+
{07CD957A-3C31-4F75-A735-16CE72E1BD71}.Debug|Any CPU.Build.0 = Debug|Any CPU
87+
{07CD957A-3C31-4F75-A735-16CE72E1BD71}.Release|Any CPU.ActiveCfg = Release|Any CPU
88+
{07CD957A-3C31-4F75-A735-16CE72E1BD71}.Release|Any CPU.Build.0 = Release|Any CPU
6489
EndGlobalSection
6590
GlobalSection(SolutionProperties) = preSolution
6691
HideSolutionNode = FALSE
@@ -69,6 +94,9 @@ Global
6994
{BFE6E6F1-1B73-404F-A3A5-30B57E5E0731} = {875D91AC-BA4C-4191-AB11-AE461DB9B8DB}
7095
{2EF674B9-8B56-4796-9933-42B2629E52C3} = {875D91AC-BA4C-4191-AB11-AE461DB9B8DB}
7196
{38A23D53-E2BF-4B76-907F-49F41D60C88E} = {875D91AC-BA4C-4191-AB11-AE461DB9B8DB}
97+
{35F5F1C5-AE4F-4B5A-8D94-1AF708724FD5} = {AF321816-B4A0-41DD-9A1D-484E8A20C6F6}
98+
{C1950E28-1CB7-4DEC-BB3A-8A0443A17282} = {AF321816-B4A0-41DD-9A1D-484E8A20C6F6}
99+
{07CD957A-3C31-4F75-A735-16CE72E1BD71} = {AF321816-B4A0-41DD-9A1D-484E8A20C6F6}
72100
EndGlobalSection
73101
GlobalSection(ExtensibilityGlobals) = postSolution
74102
SolutionGuid = {F9A60F3B-D894-4C8E-BA0F-C51115B25A5A}

‎FSharp.Profiles.props‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,11 @@
44

55
<Choose>
66
<When Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
7-
<PropertyGroup>
8-
<DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
9-
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
10-
</PropertyGroup>
117
</When>
128
<Otherwise>
139
<PropertyGroup>
1410
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
15-
<DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
16-
<DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
17-
<DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
18-
<DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
19-
<DefineConstants>$(DefineConstants);FX_NO_SYMBOLSTORE</DefineConstants>
20-
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONFIGURATION</DefineConstants>
21-
<DefineConstants>$(DefineConstants);FX_NO_WIN_REGISTRY</DefineConstants>
2211
<DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
23-
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
2412
<OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
2513
</PropertyGroup>
2614
</Otherwise>

‎FSharp.sln‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ EndProject
4040
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Service", "src\Compiler\FSharp.Compiler.Service.fsproj", "{9B4CF83C-C215-4EA0-9F8B-B5A77090F634}"
4141
EndProject
4242
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks", "{CE70D631-C5DC-417E-9CDA-B16097BEF1AC}"
43+
ProjectSection(SolutionItems) = preProject
44+
tests\benchmarks\README.md = tests\benchmarks\README.md
45+
EndProjectSection
4346
EndProject
4447
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicroPerfCSharp", "tests\benchmarks\CompiledCodeBenchmarks\MicroPerf\CS\MicroPerfCSharp.csproj", "{348DCC13-DD3E-4214-B040-5A74E8C6B782}"
4548
EndProject
@@ -101,6 +104,9 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fsiAnyCpu", "src\fsi\fsiAny
101104
EndProject
102105
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fsiArm64", "src\fsi\fsiArm64Project\fsiArm64.fsproj", "{209C7D37-8C01-413C-8698-EC25F4C86976}"
103106
EndProject
107+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "HistoricalBenchmark", "tests\benchmarks\FCSBenchmarks\BenchmarkComparison\HistoricalBenchmark.fsproj", "{BEC6E796-7E53-4888-AAFC-B8FD55C425DF}"
108+
EndProject
109+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Benchmarks", "tests\benchmarks\FCSBenchmarks\CompilerServiceBenchmarks\FSharp.Compiler.Benchmarks.fsproj", "{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}"
104110
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D58BFE8B-7C85-4D3B-B5F3-9A7BB90FF1EE}"
105111
ProjectSection(SolutionItems) = preProject
106112
src\Compiler\FSComp.txt = src\Compiler\FSComp.txt
@@ -440,6 +446,30 @@ Global
440446
{209C7D37-8C01-413C-8698-EC25F4C86976}.Release|Any CPU.Build.0 = Release|Any CPU
441447
{209C7D37-8C01-413C-8698-EC25F4C86976}.Release|x86.ActiveCfg = Release|Any CPU
442448
{209C7D37-8C01-413C-8698-EC25F4C86976}.Release|x86.Build.0 = Release|Any CPU
449+
{BEC6E796-7E53-4888-AAFC-B8FD55C425DF}.Debug|Any CPU.ActiveCfg = Release|Any CPU
450+
{BEC6E796-7E53-4888-AAFC-B8FD55C425DF}.Debug|Any CPU.Build.0 = Release|Any CPU
451+
{BEC6E796-7E53-4888-AAFC-B8FD55C425DF}.Debug|x86.ActiveCfg = Release|Any CPU
452+
{BEC6E796-7E53-4888-AAFC-B8FD55C425DF}.Debug|x86.Build.0 = Release|Any CPU
453+
{BEC6E796-7E53-4888-AAFC-B8FD55C425DF}.Proto|Any CPU.ActiveCfg = Release|Any CPU
454+
{BEC6E796-7E53-4888-AAFC-B8FD55C425DF}.Proto|Any CPU.Build.0 = Release|Any CPU
455+
{BEC6E796-7E53-4888-AAFC-B8FD55C425DF}.Proto|x86.ActiveCfg = Release|Any CPU
456+
{BEC6E796-7E53-4888-AAFC-B8FD55C425DF}.Proto|x86.Build.0 = Release|Any CPU
457+
{BEC6E796-7E53-4888-AAFC-B8FD55C425DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
458+
{BEC6E796-7E53-4888-AAFC-B8FD55C425DF}.Release|Any CPU.Build.0 = Release|Any CPU
459+
{BEC6E796-7E53-4888-AAFC-B8FD55C425DF}.Release|x86.ActiveCfg = Release|Any CPU
460+
{BEC6E796-7E53-4888-AAFC-B8FD55C425DF}.Release|x86.Build.0 = Release|Any CPU
461+
{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
462+
{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
463+
{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Debug|x86.ActiveCfg = Debug|Any CPU
464+
{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Debug|x86.Build.0 = Debug|Any CPU
465+
{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
466+
{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Proto|Any CPU.Build.0 = Debug|Any CPU
467+
{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Proto|x86.ActiveCfg = Debug|Any CPU
468+
{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Proto|x86.Build.0 = Debug|Any CPU
469+
{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
470+
{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Release|Any CPU.Build.0 = Release|Any CPU
471+
{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Release|x86.ActiveCfg = Release|Any CPU
472+
{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Release|x86.Build.0 = Release|Any CPU
443473
EndGlobalSection
444474
GlobalSection(SolutionProperties) = preSolution
445475
HideSolutionNode = FALSE
@@ -472,6 +502,8 @@ Global
472502
{68EEAB5F-8AED-42A2-BFEC-343D0AD5CB52} = {B8DDA694-7939-42E3-95E5-265C2217C142}
473503
{B6271954-3BCD-418A-BD24-56FEB923F3D3} = {B8DDA694-7939-42E3-95E5-265C2217C142}
474504
{209C7D37-8C01-413C-8698-EC25F4C86976} = {B8DDA694-7939-42E3-95E5-265C2217C142}
505+
{BEC6E796-7E53-4888-AAFC-B8FD55C425DF} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
506+
{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
475507
EndGlobalSection
476508
GlobalSection(ExtensibilityGlobals) = postSolution
477509
SolutionGuid = {BD5177C7-1380-40E7-94D2-7768E1A8B1B8}

0 commit comments

Comments
 (0)