Skip to content

Commit 5833f0c

Browse files
committed
Merge branch 'master' of http://github.com/Microsoft/visualfsharp into proto
2 parents 8f09004 + 53f8ea1 commit 5833f0c

File tree

630 files changed

+4857
-9654
lines changed

Some content is hidden

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

630 files changed

+4857
-9654
lines changed
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve F#
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
Please provide a succinct description of the issue.
11+
12+
**Repro steps**
13+
14+
Provide the steps required to reproduce the problem:
15+
16+
1. Step A
17+
2. Step B
18+
19+
If possible attach a zip file with the repro case. This often makes it easier for others to reproduce.
20+
The zip file should ideally represent the situation just before the call/step that is problematic.
21+
22+
**Expected behavior**
23+
24+
Provide a description of the expected behavior.
25+
26+
**Actual behavior**
27+
28+
Provide a description of the actual behaviour observed.
29+
30+
**Known workarounds**
31+
32+
Provide a description of any known workarounds.
33+
34+
**Related information**
35+
36+
Provide any related information (optional):
37+
38+
* Operating system
39+
* .NET Runtime kind (.NET Core, .NET Framework, Mono)
40+
* Editing Tools (e.g. Visual Studio Version, Visual Studio)
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for the F# tools or compiler
4+
title: ''
5+
labels: Feature Request
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ extras
9595
ossreadme*.txt
9696
*.csproj.user
9797
*.fsproj.user
98+
*.vbproj.user
9899
*.sln.DotSettings.user
99100
*.log
100101
*.jrs

.vsconfig

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"version": "1.0",
3+
"components": [
4+
"Microsoft.VisualStudio.Component.CoreEditor",
5+
"Microsoft.VisualStudio.Workload.CoreEditor",
6+
"Microsoft.VisualStudio.Component.NuGet",
7+
"Microsoft.Net.Component.4.6.1.TargetingPack",
8+
"Microsoft.VisualStudio.Component.Roslyn.Compiler",
9+
"Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
10+
"Microsoft.VisualStudio.Component.FSharp",
11+
"Microsoft.Net.Core.Component.SDK.2.1",
12+
"Microsoft.NetCore.ComponentGroup.DevelopmentTools.2.1",
13+
"Microsoft.Net.Component.4.7.2.SDK",
14+
"Microsoft.Net.Component.4.7.2.TargetingPack",
15+
"Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
16+
"Microsoft.Component.MSBuild",
17+
"Microsoft.VisualStudio.Component.TextTemplating",
18+
"Microsoft.VisualStudio.Component.ManagedDesktop.Core",
19+
"Microsoft.Net.Component.4.6.TargetingPack",
20+
"Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
21+
"Microsoft.VisualStudio.Component.FSharp.Desktop",
22+
"Microsoft.VisualStudio.Workload.ManagedDesktop",
23+
"Microsoft.VisualStudio.Component.VSSDK",
24+
"Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites",
25+
"Microsoft.VisualStudio.Workload.VisualStudioExtension"
26+
]
27+
}

.vsts-pr.yaml

Lines changed: 0 additions & 172 deletions
This file was deleted.

.vsts-signed.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ variables:
55
- name: VisualStudioDropName
66
value: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
77

8+
# Variables defined in yml cannot be overridden at queue time; instead overridable variables must be defined in the web UI.
9+
# Commenting out until something like this is supported: https://github.com/Microsoft/azure-pipelines-yaml/pull/129
10+
#variables:
11+
#- name: SkipTests
12+
# defaultValue: false
13+
814
jobs:
915
- job: Full_Signed
1016
pool:
@@ -26,6 +32,7 @@ jobs:
2632
- script: eng\CIBuild.cmd
2733
-configuration $(BuildConfiguration)
2834
-testAll
35+
-officialSkipTests $(SkipTests)
2936
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
3037
/p:VisualStudioDropName=$(VisualStudioDropName)
3138
/p:DotNetSignType=$(SignType)
@@ -55,7 +62,7 @@ jobs:
5562
ArtifactName: 'Test Results'
5663
publishLocation: Container
5764
continueOnError: true
58-
condition: succeededOrFailed()
65+
condition: and(succeededOrFailed(), ne(variables['SkipTests'], 'true'))
5966

6067
# Upload VSTS Drop
6168
- task: ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1

DEVGUIDE.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ This will remove any files that are not under version control. This is necessary
1717
Follow the instructions below to build and develop the F# Compiler, Core Library and tools on Windows, macOS and Linux.
1818

1919
- [Developing the F# Compiler (Windows)](#developing-the-f-compiler-windows)
20-
- [Developing the F# Compiler (Linux)](#developing-the-f-compiler-linux)
21-
- [Developing the F# Compiler (macOS)](#developing-the-f-compiler-macos)
20+
- [Developing the F# Compiler (Linux/macOS)](#developing-the-f-compiler-linuxmacos)
2221
- [Developing the Visual F# IDE Tools (Windows Only)](#developing-the-visual-f-ide-tools-windows-only)
2322
- [Notes and Resources](#notes)
2423

@@ -27,6 +26,7 @@ Follow the instructions below to build and develop the F# Compiler, Core Library
2726
Install
2827

2928
- [.NET Framework 4.7.2](https://dotnet.microsoft.com/download/dotnet-framework/net472)
29+
- [.NET Core 3 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.0)
3030

3131
**NOTE on Windows:**
3232

@@ -70,9 +70,7 @@ To build and test Visual F# IDE Tools, install these requirements:
7070
- Launch the Visual Studio Installer
7171
- Under the **"Windows"** workload, select **".NET desktop development"**
7272
- Select the optional component **"F# desktop language support"**
73-
- Under the **"Mobile & Gaming"** workload, select **"Mobile development with .NET"**
7473
- Under the **"Other Toolsets"** workload, select **"Visual Studio extension development"**
75-
- On the **"Individual Components"** tab, select **".NET Framework 4.7.2 SDK"** and **".NET Framework 4.7.2 targeting pack"**
7674

7775
Steps to build:
7876

FSharp.sln

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packages", "Packages", "{38
3838
EndProject
3939
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.Compiler", "src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.csproj", "{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}"
4040
EndProject
41+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.LanguageServer", "src\fsharp\FSharp.Compiler.LanguageServer\FSharp.Compiler.LanguageServer.fsproj", "{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}"
42+
EndProject
43+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.LanguageServer.UnitTests", "tests\FSharp.Compiler.LanguageServer.UnitTests\FSharp.Compiler.LanguageServer.UnitTests.fsproj", "{C97819B0-B428-4B96-9CD7-497D2D1C738C}"
44+
EndProject
4145
Global
4246
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4347
Debug|Any CPU = Debug|Any CPU
@@ -180,6 +184,30 @@ Global
180184
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Release|Any CPU.Build.0 = Release|Any CPU
181185
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Release|x86.ActiveCfg = Release|Any CPU
182186
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Release|x86.Build.0 = Release|Any CPU
187+
{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
188+
{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
189+
{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}.Debug|x86.ActiveCfg = Debug|Any CPU
190+
{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}.Debug|x86.Build.0 = Debug|Any CPU
191+
{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
192+
{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}.Proto|Any CPU.Build.0 = Debug|Any CPU
193+
{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}.Proto|x86.ActiveCfg = Debug|Any CPU
194+
{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}.Proto|x86.Build.0 = Debug|Any CPU
195+
{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
196+
{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}.Release|Any CPU.Build.0 = Release|Any CPU
197+
{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}.Release|x86.ActiveCfg = Release|Any CPU
198+
{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}.Release|x86.Build.0 = Release|Any CPU
199+
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
200+
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Debug|Any CPU.Build.0 = Debug|Any CPU
201+
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Debug|x86.ActiveCfg = Debug|Any CPU
202+
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Debug|x86.Build.0 = Debug|Any CPU
203+
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
204+
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Proto|Any CPU.Build.0 = Debug|Any CPU
205+
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Proto|x86.ActiveCfg = Debug|Any CPU
206+
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Proto|x86.Build.0 = Debug|Any CPU
207+
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Release|Any CPU.ActiveCfg = Release|Any CPU
208+
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Release|Any CPU.Build.0 = Release|Any CPU
209+
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Release|x86.ActiveCfg = Release|Any CPU
210+
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Release|x86.Build.0 = Release|Any CPU
183211
EndGlobalSection
184212
GlobalSection(SolutionProperties) = preSolution
185213
HideSolutionNode = FALSE
@@ -196,6 +224,8 @@ Global
196224
{88E2D422-6852-46E3-A740-83E391DC7973} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
197225
{53C0DAAD-158C-4658-8EC7-D7341530239F} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
198226
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7} = {3840F2E7-3898-45F7-8CF7-1E6829E56DB8}
227+
{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA} = {B8DDA694-7939-42E3-95E5-265C2217C142}
228+
{C97819B0-B428-4B96-9CD7-497D2D1C738C} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
199229
EndGlobalSection
200230
GlobalSection(ExtensibilityGlobals) = postSolution
201231
SolutionGuid = {BD5177C7-1380-40E7-94D2-7768E1A8B1B8}

0 commit comments

Comments
 (0)