Skip to content

Commit 74c6e22

Browse files
committed
Merge branch 'master' of github.com:dotnet/fsharp into final_fix_3113
Conflicts: src/absil/ilsupp.fs src/absil/ilwrite.fs src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
2 parents da881d8 + 51684d4 commit 74c6e22

1,655 files changed

Lines changed: 51939 additions & 57364 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ artifacts/
44
/tests/scripts/current
55
.dotnet/
66
.packages/
7-
./tools
7+
.tools/
88

99
# Patches that may have been generated by scripts.
1010
# (These aren't generally useful to commit directly; if anything, they should be applied.)
@@ -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 & 142 deletions
This file was deleted.

.vsts-signed.yaml

Lines changed: 8 additions & 9 deletions
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
@@ -89,14 +96,6 @@ jobs:
8996
ArtifactName: 'Nightly'
9097
condition: succeeded()
9198

92-
# Publish nightly package to MyGet
93-
- task: PowerShell@1
94-
displayName: Publish nightly package to MyGet
95-
inputs:
96-
scriptName: 'setup\publish-assets.ps1'
97-
arguments: '-artifactsPath artifacts -configuration $(BuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)'
98-
condition: succeeded()
99-
10099
# Package publish
101100
- task: PublishBuildArtifacts@1
102101
displayName: Push Asset Manifests

0 commit comments

Comments
 (0)