Skip to content

Commit 906ed7a

Browse files
safesparrowsafesparrow
committed
Merge branch 'main' into otel
2 parents 5658f02 + 0063f20 commit 906ed7a

File tree

560 files changed

+17901
-8359
lines changed

Some content is hidden

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

560 files changed

+17901
-8359
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"fantomas": {
6-
"version": "5.0.0-alpha-011",
6+
"version": "5.0.0-beta-005",
77
"commands": [
88
"fantomas"
99
]

‎.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,

‎FSharp.Profiles.props‎

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

55
<Choose>
66
<When Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
7-
<PropertyGroup>
8-
<DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
9-
</PropertyGroup>
107
</When>
118
<Otherwise>
129
<PropertyGroup>
1310
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
14-
<DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
15-
<DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
16-
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONFIGURATION</DefineConstants>
17-
<DefineConstants>$(DefineConstants);FX_NO_WIN_REGISTRY</DefineConstants>
1811
<DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
19-
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
2012
<OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
2113
</PropertyGroup>
2214
</Otherwise>

‎FSharpBuild.Directory.Build.props‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<DisableAutoSetFscCompilerPath>true</DisableAutoSetFscCompilerPath>
1414
</PropertyGroup>
1515

16+
<PropertyGroup Condition="'$(Configuration)' == 'Proto'">
17+
<FSCoreVersion>$(FSCoreShippedVersion)</FSCoreVersion>
18+
</PropertyGroup>
19+
1620
<PropertyGroup>
1721
<FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
1822
<FSharpTestsRoot>$(RepoRoot)tests</FSharpTestsRoot>
@@ -21,6 +25,7 @@
2125
<ValueTupleImplicitPackageVersion>4.4.0</ValueTupleImplicitPackageVersion>
2226
<WarningsAsErrors>1182;0025;$(WarningsAsErrors)</WarningsAsErrors>
2327
<OtherFlags>$(OtherFlags) --nowarn:3384</OtherFlags>
28+
<OtherFlags>$(OtherFlags) --times --nowarn:75</OtherFlags>
2429
</PropertyGroup>
2530

2631
<!-- nuget -->
@@ -79,6 +84,16 @@
7984
<DefineConstants>$(DefineConstants);TESTING_ON_LINUX</DefineConstants>
8085
</PropertyGroup>
8186

87+
88+
<!-- CompressAllMetadata is a switch set by the CI to do a test pass where we compress the metadata for the assemblies -->
89+
<!-- We don't compress the proto-compiler yet, because no shipped compiler, and the arcade compiler don't yet support compression -->
90+
<PropertyGroup Condition="'$(Configuration)' == 'Proto' or '$(CompressAllMetadata)' != 'true'">
91+
<CompressMetadata>false</CompressMetadata>
92+
</PropertyGroup>
93+
<PropertyGroup Condition="'$(Configuration)' != 'Proto' and '$(CompressAllMetadata)' == 'true'">
94+
<CompressMetadata>true</CompressMetadata>
95+
</PropertyGroup>
96+
8297
<!-- SDK targets override -->
8398
<PropertyGroup Condition="'$(Configuration)' != 'Proto' AND '$(DisableCompilerRedirection)'!='true' AND Exists('$(ProtoOutputPath)')">
8499
<FSharpTargetsPath>$(ProtoOutputPath)\fsc\Microsoft.FSharp.Targets</FSharpTargetsPath>

‎FSharpBuild.Directory.Build.targets‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
<Import Project="eng\targets\NuGet.targets" />
77
<Import Project="FSharp.Profiles.props" />
88

9+
<PropertyGroup>
10+
<DefineConstants Condition="'$(Configuration)'=='release'">$(DefineConstants);Release</DefineConstants>
11+
<DefineConstants Condition="'$(Configuration)'=='debug'">$(DefineConstants);Debug</DefineConstants>
12+
</PropertyGroup>
13+
914
<ItemDefinitionGroup>
1015
<NoneSubstituteText>
1116
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
@@ -137,8 +142,8 @@
137142
</PropertyGroup>
138143

139144
<Target Name="PrefixRepoToReleaseNotes"
145+
AfterTargets="InitializeSourceControlInformationFromSourceControlManager"
140146
BeforeTargets="InitializeStandardNuspecProperties"
141-
DependsOnTargets="InitializeSourceControlInformationFromSourceControlManager"
142147
Condition="'$(IsPackable)'=='true'">
143148

144149
<PropertyGroup>

‎FSharpTests.Directory.Build.props‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
<FscToolPath>$([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)'))</FscToolPath>
2323
<FscToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FscToolExe>
2424
<FscToolExe Condition="'$(OS)' == 'Unix'">dotnet</FscToolExe>
25-
<DotnetFscCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\net6.0\fsc.dll</DotnetFscCompilerPath>
25+
<DotnetFscCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\net7.0\fsc.dll</DotnetFscCompilerPath>
2626

2727
<FsiToolPath>$([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)'))</FsiToolPath>
2828
<FsiToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FsiToolExe>
2929
<FsiToolExe Condition="'$(OS)' == 'Unix'">dotnet</FsiToolExe>
30-
<DotnetFsiCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\net6.0\fsi.dll</DotnetFsiCompilerPath>
30+
<DotnetFsiCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\net7.0\fsi.dll</DotnetFsiCompilerPath>
3131
</PropertyGroup>
3232

3333
<!-- SDK targets override -->
3434
<PropertyGroup>
3535
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'!='Core'">net472</_FSharpBuildTargetFramework>
36-
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'=='Core'">net6.0</_FSharpBuildTargetFramework>
36+
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'=='Core'">net7.0</_FSharpBuildTargetFramework>
3737
<_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework)</_FSharpBuildBinPath>
3838

3939
<FSharpBuildAssemblyFile>$(_FSharpBuildBinPath)\FSharp.Build.dll</FSharpBuildAssemblyFile>
@@ -42,6 +42,7 @@
4242
<FSharpPropsShim>$(_FSharpBuildBinPath)/Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
4343
<FSharpTargetsShim>$(_FSharpBuildBinPath)/Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
4444
<FSharpOverridesTargetsShim>$(_FSharpBuildBinPath)/Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
45+
4546
</PropertyGroup>
4647

4748
</Project>

0 commit comments

Comments
 (0)