Skip to content

Commit 4080ff8

Browse files
vzarytovskiivzarytovskii
committed
Revert "Merge branch 'main' into unfiltered-tokenize"
This reverts commit 9e8980c, reversing changes made to 4ff375e.
1 parent 9e8980c commit 4080ff8

File tree

1,165 files changed

+104692
-81355
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,165 files changed

+104692
-81355
lines changed

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,13 @@ assignees: ''
88
---
99

1010
**Is your feature request related to a problem? Please describe.**
11-
1211
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
1312

1413
**Describe the solution you'd like**
15-
1614
A clear and concise description of what you want to happen.
1715

1816
**Describe alternatives you've considered**
19-
2017
A clear and concise description of any alternative solutions or features you've considered.
2118

2219
**Additional context**
23-
24-
If the issue is about:
25-
* improving a compiler error message, please mention "related: #1103"
26-
* improving/adjusting the parser, please mention "related: #11481"
27-
2820
Add any other context or screenshots about the feature request here.

‎.gitignore‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,43 @@ artifacts/
99
# Patches that may have been generated by scripts.
1010
# (These aren't generally useful to commit directly; if anything, they should be applied.)
1111
scripts/*.patch
12+
/fcs/FSharp.Compiler.Service/illex.fs
13+
/fcs/FSharp.Compiler.Service/ilpars.fs
14+
/fcs/FSharp.Compiler.Service/ilpars.fsi
15+
/fcs/FSharp.Compiler.Service/lex.fs
16+
/fcs/FSharp.Compiler.Service/pars.fs
17+
/fcs/FSharp.Compiler.Service/pars.fsi
18+
/fcs/FSharp.Compiler.Service/pplex.fs
19+
/fcs/FSharp.Compiler.Service/pppars.fs
20+
/fcs/FSharp.Compiler.Service/pppars.fsi
1221
/src/*.userprefs
1322
/src/fsharp/FSStrings.resources
1423
/src/fsharp/FSharp.Build/*.resx
24+
/src/fsharp/FSharp.Build-proto/*.resx
25+
/src/fsharp/FSharp.Build-proto/*.resources
26+
/src/fsharp/FSharp.Compiler-proto/*.resx
27+
/src/fsharp/FSharp.Compiler-proto/*.resources
28+
/src/fsharp/FSharp.Compiler-proto/*.sln
29+
/src/fsharp/FSharp.Compiler-proto/*.userprefs
1530
/src/fsharp/fsi/*.resx
1631
/src/fsharp/FSharp.Compiler.Interactive.Settings/*.resx
1732
/src/fsharp/FSharp.Compiler.Server.Shared/*.resx
1833
/src/fsharp/fsi/Fsi.sln
1934
/src/fsharp/FSharp.Build/*.resources
20-
/src/fsharp/FSharp.Compiler.Service/*.resx
21-
/src/fsharp/FSharp.Compiler.Service/*.resources
22-
/src/fsharp/FSharp.Compiler.Service/*.sln
23-
/src/fsharp/FSharp.Compiler.Service/*.userprefs
35+
/src/fsharp/FSharp.Compiler.Private/*.resx
36+
/src/fsharp/FSharp.Compiler.Private/*.resources
37+
/src/fsharp/FSharp.Compiler.Private/*.sln
38+
/src/fsharp/FSharp.Compiler.Private/*.userprefs
2439
/src/*.log
40+
/src/fsharp/Fsc-proto/illex.fs
41+
/src/fsharp/Fsc-proto/ilpars.fs
42+
/src/fsharp/Fsc-proto/ilpars.fsi
43+
/src/fsharp/Fsc-proto/lex.fs
44+
/src/fsharp/Fsc-proto/pars.fs
45+
/src/fsharp/Fsc-proto/pars.fsi
46+
/src/fsharp/Fsc-proto/pplex.fs
47+
/src/fsharp/Fsc-proto/pppars.fs
48+
/src/fsharp/Fsc-proto/pppars.fsi
2549
/src/fsharp/FSharp.LanguageService.Compiler/illex.*
2650
/src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
2751
/src/fsharp/FSharp.LanguageService.Compiler/lex.*

‎DEVGUIDE.md‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ Running any of the above will build the latest changes and run tests against the
108108

109109
If your changes involve modifying the list of language keywords in any way, (e.g. when implementing a new keyword), the XLF localization files need to be synced with the corresponding resx files. This can be done automatically by running
110110

111-
pushd src\fsharp\FSharp.Compiler.Service
112-
msbuild FSharp.Compiler.Service.fsproj /t:UpdateXlf
111+
pushd src\fsharp\FSharp.Compiler.Private
112+
msbuild FSharp.Compiler.Private.fsproj /t:UpdateXlf
113113
popd
114114

115115
This only works on Windows/.NETStandard framework, so changing this from any other platform requires editing and syncing all of the XLF files manually.
@@ -122,7 +122,7 @@ See (DEVGUIDE.md#Developing on Windows) for instructions to install what is need
122122

123123
### Quickly see your changes locally
124124

125-
First, ensure that `VisualFSharpDebug` is the startup project.
125+
First, ensure that `VisualFSharpFull` is the startup project.
126126

127127
Then, use the **f5** or **ctrl+f5** keyboard shortcuts to test your tooling changes. The former will debug a new instance of Visual Studio. The latter will launch a new instance of Visual Studio, but with your changes installed.
128128

@@ -136,7 +136,7 @@ If you'd like to "run with your changes", you can produce a VSIX and install it
136136

137137
```
138138
VSIXInstaller.exe /u:"VisualFSharp"
139-
VSIXInstaller.exe artifacts\VSSetup\Release\VisualFSharpDebug.vsix
139+
VSIXInstaller.exe artifacts\VSSetup\Release\VisualFSharpFull.vsix
140140
```
141141

142142
It's important to use `Release` if you want to see if your changes have had a noticeable performance impact.
@@ -170,4 +170,9 @@ See the "Debugging The Compiler" section of this [article](https://medium.com/@w
170170

171171
If you are behind a proxy server, NuGet client tool must be configured to use it:
172172

173-
See the Nuget config file documention for use with a proxy server [https://docs.microsoft.com/en-us/nuget/reference/nuget-config-file](https://docs.microsoft.com/en-us/nuget/reference/nuget-config-file)
173+
```
174+
.nuget\nuget.exe config -set http_proxy=proxy.domain.com:8080 -ConfigFile NuGet.Config
175+
.nuget\nuget.exe config -set http_proxy.user=user_name -ConfigFile NuGet.Config
176+
.nuget\nuget.exe config -set http_proxy.password=user_password -ConfigFile NuGet.Config
177+
```
178+
Where you should set proper proxy address, user name and password.

‎FSharp.Profiles.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONFIGURATION</DefineConstants>
2121
<DefineConstants>$(DefineConstants);FX_NO_WIN_REGISTRY</DefineConstants>
2222
<DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
23+
<DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
2324
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
2425
<OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
2526
</PropertyGroup>

‎FSharp.sln‎

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.28729.10
55
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private", "src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
7+
EndProject
68
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Server.Shared", "src\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj", "{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}"
79
EndProject
810
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Core", "src\fsharp\FSharp.Core\FSharp.Core.fsproj", "{DED3BBD7-53F4-428A-8C9F-27968E768605}"
@@ -44,8 +46,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.Compiler",
4446
EndProject
4547
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.DependencyManager.Nuget", "src\fsharp\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.Nuget.fsproj", "{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}"
4648
EndProject
49+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private.Scripting", "src\fsharp\FSharp.Compiler.Private.Scripting\FSharp.Compiler.Private.Scripting.fsproj", "{6771860A-614D-4FDD-A655-4C70EBCC91B0}"
50+
EndProject
4751
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private.Scripting.UnitTests", "tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj", "{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}"
4852
EndProject
53+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.DotNet.DependencyManager", "src\fsharp\Microsoft.DotNet.DependencyManager\Microsoft.DotNet.DependencyManager.fsproj", "{B5A043F8-6D7F-4D4E-B8AD-5880070180B6}"
54+
EndProject
4955
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.ComponentTests", "tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj", "{FAC5A3BF-C0D6-437A-868A-E962AA00B418}"
5056
EndProject
5157
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fsharpqa", "fsharpqa", "{292C4F92-A313-4CAF-9552-731F39C6C21F}"
@@ -70,6 +76,18 @@ Global
7076
Release|x86 = Release|x86
7177
EndGlobalSection
7278
GlobalSection(ProjectConfigurationPlatforms) = postSolution
79+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
81+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|x86.ActiveCfg = Debug|Any CPU
82+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|x86.Build.0 = Debug|Any CPU
83+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Proto|Any CPU.ActiveCfg = Release|Any CPU
84+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Proto|Any CPU.Build.0 = Release|Any CPU
85+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Proto|x86.ActiveCfg = Release|Any CPU
86+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Proto|x86.Build.0 = Release|Any CPU
87+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
88+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.Build.0 = Release|Any CPU
89+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|x86.ActiveCfg = Release|Any CPU
90+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|x86.Build.0 = Release|Any CPU
7391
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7492
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Debug|Any CPU.Build.0 = Debug|Any CPU
7593
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -238,6 +256,18 @@ Global
238256
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Release|Any CPU.Build.0 = Release|Any CPU
239257
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Release|x86.ActiveCfg = Release|Any CPU
240258
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Release|x86.Build.0 = Release|Any CPU
259+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
260+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
261+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Debug|x86.ActiveCfg = Debug|Any CPU
262+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Debug|x86.Build.0 = Debug|Any CPU
263+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
264+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Proto|Any CPU.Build.0 = Debug|Any CPU
265+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Proto|x86.ActiveCfg = Debug|Any CPU
266+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Proto|x86.Build.0 = Debug|Any CPU
267+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
268+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Release|Any CPU.Build.0 = Release|Any CPU
269+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Release|x86.ActiveCfg = Release|Any CPU
270+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Release|x86.Build.0 = Release|Any CPU
241271
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
242272
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
243273
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -250,6 +280,18 @@ Global
250280
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Release|Any CPU.Build.0 = Release|Any CPU
251281
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Release|x86.ActiveCfg = Release|Any CPU
252282
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Release|x86.Build.0 = Release|Any CPU
283+
{B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
284+
{B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
285+
{B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Debug|x86.ActiveCfg = Debug|Any CPU
286+
{B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Debug|x86.Build.0 = Debug|Any CPU
287+
{B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
288+
{B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Proto|Any CPU.Build.0 = Debug|Any CPU
289+
{B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Proto|x86.ActiveCfg = Debug|Any CPU
290+
{B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Proto|x86.Build.0 = Debug|Any CPU
291+
{B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
292+
{B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Release|Any CPU.Build.0 = Release|Any CPU
293+
{B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Release|x86.ActiveCfg = Release|Any CPU
294+
{B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Release|x86.Build.0 = Release|Any CPU
253295
{FAC5A3BF-C0D6-437A-868A-E962AA00B418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
254296
{FAC5A3BF-C0D6-437A-868A-E962AA00B418}.Debug|Any CPU.Build.0 = Debug|Any CPU
255297
{FAC5A3BF-C0D6-437A-868A-E962AA00B418}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -303,6 +345,7 @@ Global
303345
HideSolutionNode = FALSE
304346
EndGlobalSection
305347
GlobalSection(NestedProjects) = preSolution
348+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
306349
{DED3BBD7-53F4-428A-8C9F-27968E768605} = {3058BC79-8E79-4645-B05D-48CC182FA8A6}
307350
{702A7979-BCF9-4C41-853E-3ADFC9897890} = {B8DDA694-7939-42E3-95E5-265C2217C142}
308351
{C94C257C-3C0A-4858-B5D8-D746498D1F08} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
@@ -316,14 +359,16 @@ Global
316359
{53C0DAAD-158C-4658-8EC7-D7341530239F} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
317360
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7} = {3840F2E7-3898-45F7-8CF7-1E6829E56DB8}
318361
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
362+
{6771860A-614D-4FDD-A655-4C70EBCC91B0} = {B8DDA694-7939-42E3-95E5-265C2217C142}
319363
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
364+
{B5A043F8-6D7F-4D4E-B8AD-5880070180B6} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
320365
{FAC5A3BF-C0D6-437A-868A-E962AA00B418} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
321366
{292C4F92-A313-4CAF-9552-731F39C6C21F} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
322367
{FF76050A-415A-4FB4-A0E5-13CBF38D83E0} = {292C4F92-A313-4CAF-9552-731F39C6C21F}
323368
{07482B5E-4980-4285-B732-820F15870284} = {FF76050A-415A-4FB4-A0E5-13CBF38D83E0}
324369
{25568CD2-E654-4C8F-BE5B-59BABFC5BD20} = {07482B5E-4980-4285-B732-820F15870284}
325370
{DDFD06DC-D7F2-417F-9177-107764EEBCD8} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
326-
{9B4CF83C-C215-4EA0-9F8B-B5A77090F634} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
371+
{9B4CF83C-C215-4EA0-9F8B-B5A77090F634} = {3058BC79-8E79-4645-B05D-48CC182FA8A6}
327372
EndGlobalSection
328373
GlobalSection(ExtensibilityGlobals) = postSolution
329374
SolutionGuid = {BD5177C7-1380-40E7-94D2-7768E1A8B1B8}

‎FSharpBuild.Directory.Build.props‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,13 @@
88
</PropertyGroup>
99

1010
<!-- directory locations -->
11-
12-
<PropertyGroup Condition="'$(OS)' != 'Unix' and '$(DisableAutoSetFscCompilerPath)' != 'true' and '$(Configuration)' != 'Proto' and '$(DOTNET_HOST_PATH)' != ''">
13-
<DisableAutoSetFscCompilerPath>true</DisableAutoSetFscCompilerPath>
14-
</PropertyGroup>
15-
1611
<PropertyGroup>
1712
<FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
1813
<FSharpTestsRoot>$(RepoRoot)tests</FSharpTestsRoot>
1914
<SymStoreDirectory>$(ArtifactsDir)\SymStore</SymStoreDirectory>
2015
<ProtoOutputPath>$(ArtifactsDir)\Bootstrap</ProtoOutputPath>
2116
<ValueTupleImplicitPackageVersion>4.4.0</ValueTupleImplicitPackageVersion>
2217
<WarningsAsErrors>1182;0025;$(WarningsAsErrors)</WarningsAsErrors>
23-
<OtherFlags>$(OtherFlags) --nowarn:3384</OtherFlags>
2418
</PropertyGroup>
2519

2620
<!-- nuget -->

‎FSharpTests.Directory.Build.props‎

Lines changed: 3 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)\net5.0\fsc.dll</DotnetFscCompilerPath>
25+
<DotnetFscCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\netcoreapp3.1\fsc.exe</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)\net5.0\fsi.dll</DotnetFsiCompilerPath>
30+
<DotnetFsiCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\netcoreapp3.1\fsi.exe</DotnetFsiCompilerPath>
3131
</PropertyGroup>
3232

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

3939
<FSharpBuildAssemblyFile>$(_FSharpBuildBinPath)\FSharp.Build.dll</FSharpBuildAssemblyFile>

‎INTERNAL.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ Note that usually only the most recent link in each section is interesting. Old
77
The PR build definition can be found [here](https://dev.azure.com/dnceng/public/_build?definitionId=496) or by
88
navigating through an existing PR.
99

10-
There is also a duplicate scouting PR build that is identical to the normal PR build _except_ that it uses a different Windows
11-
machine queue that always has the next preview build of Visual Studio installed. This is to hopefully get ahead of any breaking
12-
API changes. That build definition is [here](https://dev.azure.com/dnceng/public/_build?definitionId=961).
13-
1410
## Signed Build Definitions
1511

1612
[VS 16.4 to current](https://dev.azure.com/dnceng/internal/_build?definitionId=499&_a=summary)

‎NuGet.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
<!-- Only specify feed for Arcade SDK (see https://github.com/Microsoft/msbuild/issues/2982) -->
77
<packageSources>
88
<clear />
9+
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
910
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
1011
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
1112
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
1213
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
13-
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
14+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
1415
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
1516
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
1617
<add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />

‎README.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,19 @@ Even if you find a single-character typo, we're happy to take the change! Althou
6060
|:------:|:------:|
6161
|main|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/fsharp/fsharp-ci?branchName=main)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=496&branchName=main)|
6262

63+
## Using nightly releases in Visual Studio
64+
65+
You can use the latest `main` build of the F# compiler and tools for Visual Studio via our nightly releases if you are a Visual Studio user. See details on setup here:
66+
67+
https://blogs.msdn.microsoft.com/dotnet/2017/03/14/announcing-nightly-releases-for-the-visual-f-tools/
68+
69+
### Even more nightly than the nightly
70+
71+
Alternatively, if you _really_ want to live on the bleeding edge, you can set up a nightly feed for the Visual Studio preview releases, which use the latest commit in the preview branch. To do so, follow the same instructions as the above blog post, but instead with these links:
72+
73+
* Set your feed to the preview feed: https://dotnet.myget.org/F/fsharp-preview/vsix
74+
* Install a VSIX manually from the preview feed: https://dotnet.myget.org/feed/fsharp-preview/package/vsix/VisualFSharp
75+
6376
## Per-build NuGet packages
6477

6578
Per-build verions of our NuGet packages are available via this URL: `https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json `

0 commit comments

Comments
 (0)