Skip to content

Commit

Permalink
Merge branch 'master' of github.com:dotnet/fsharp into final_fix_3113
Browse files Browse the repository at this point in the history
 Conflicts:
	src/absil/ilsupp.fs
	src/absil/ilwrite.fs
	src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
  • Loading branch information
matthid committed Jun 20, 2019
2 parents da881d8 + 51684d4 commit 74c6e22
Show file tree
Hide file tree
Showing 1,655 changed files with 51,939 additions and 57,364 deletions.
40 changes: 40 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
name: Bug report
about: Create a report to help us improve F#
title: ''
labels: ''
assignees: ''

---

Please provide a succinct description of the issue.

**Repro steps**

Provide the steps required to reproduce the problem:

1. Step A
2. Step B

If possible attach a zip file with the repro case. This often makes it easier for others to reproduce.
The zip file should ideally represent the situation just before the call/step that is problematic.

**Expected behavior**

Provide a description of the expected behavior.

**Actual behavior**

Provide a description of the actual behaviour observed.

**Known workarounds**

Provide a description of any known workarounds.

**Related information**

Provide any related information (optional):

* Operating system
* .NET Runtime kind (.NET Core, .NET Framework, Mono)
* Editing Tools (e.g. Visual Studio Version, Visual Studio)
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for the F# tools or compiler
title: ''
labels: Feature Request
assignees: ''

---

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

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ artifacts/
/tests/scripts/current
.dotnet/
.packages/
./tools
.tools/

# Patches that may have been generated by scripts.
# (These aren't generally useful to commit directly; if anything, they should be applied.)
Expand Down Expand Up @@ -95,6 +95,7 @@ extras
ossreadme*.txt
*.csproj.user
*.fsproj.user
*.vbproj.user
*.sln.DotSettings.user
*.log
*.jrs
Expand Down
27 changes: 27 additions & 0 deletions .vsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Component.CoreEditor",
"Microsoft.VisualStudio.Workload.CoreEditor",
"Microsoft.VisualStudio.Component.NuGet",
"Microsoft.Net.Component.4.6.1.TargetingPack",
"Microsoft.VisualStudio.Component.Roslyn.Compiler",
"Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
"Microsoft.VisualStudio.Component.FSharp",
"Microsoft.Net.Core.Component.SDK.2.1",
"Microsoft.NetCore.ComponentGroup.DevelopmentTools.2.1",
"Microsoft.Net.Component.4.7.2.SDK",
"Microsoft.Net.Component.4.7.2.TargetingPack",
"Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
"Microsoft.Component.MSBuild",
"Microsoft.VisualStudio.Component.TextTemplating",
"Microsoft.VisualStudio.Component.ManagedDesktop.Core",
"Microsoft.Net.Component.4.6.TargetingPack",
"Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
"Microsoft.VisualStudio.Component.FSharp.Desktop",
"Microsoft.VisualStudio.Workload.ManagedDesktop",
"Microsoft.VisualStudio.Component.VSSDK",
"Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites",
"Microsoft.VisualStudio.Workload.VisualStudioExtension"
]
}
142 changes: 0 additions & 142 deletions .vsts-pr.yaml

This file was deleted.

17 changes: 8 additions & 9 deletions .vsts-signed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ variables:
- name: VisualStudioDropName
value: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)

# Variables defined in yml cannot be overridden at queue time; instead overridable variables must be defined in the web UI.
# Commenting out until something like this is supported: https://github.com/Microsoft/azure-pipelines-yaml/pull/129
#variables:
#- name: SkipTests
# defaultValue: false

jobs:
- job: Full_Signed
pool:
Expand All @@ -26,6 +32,7 @@ jobs:
- script: eng\CIBuild.cmd
-configuration $(BuildConfiguration)
-testAll
-officialSkipTests $(SkipTests)
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
/p:VisualStudioDropName=$(VisualStudioDropName)
/p:DotNetSignType=$(SignType)
Expand Down Expand Up @@ -55,7 +62,7 @@ jobs:
ArtifactName: 'Test Results'
publishLocation: Container
continueOnError: true
condition: succeededOrFailed()
condition: and(succeededOrFailed(), ne(variables['SkipTests'], 'true'))

# Upload VSTS Drop
- task: ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1
Expand Down Expand Up @@ -89,14 +96,6 @@ jobs:
ArtifactName: 'Nightly'
condition: succeeded()

# Publish nightly package to MyGet
- task: PowerShell@1
displayName: Publish nightly package to MyGet
inputs:
scriptName: 'setup\publish-assets.ps1'
arguments: '-artifactsPath artifacts -configuration $(BuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)'
condition: succeeded()

# Package publish
- task: PublishBuildArtifacts@1
displayName: Push Asset Manifests
Expand Down
Loading

0 comments on commit 74c6e22

Please sign in to comment.