merge master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -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)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -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.

.vsconfig

@@ -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"
+  ]
+}

.vsts-signed.yaml

@@ -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:
@@ -26,6 +32,7 @@ jobs:
   - script: eng\CIBuild.cmd
             -configuration $(BuildConfiguration)
             -testAll
+            -officialSkipTests $(SkipTests)
             /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
             /p:VisualStudioDropName=$(VisualStudioDropName)
             /p:DotNetSignType=$(SignType)
@@ -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

DEVGUIDE.md

@@ -17,8 +17,7 @@ This will remove any files that are not under version control. This is necessary
 Follow the instructions below to build and develop the F# Compiler, Core Library and tools on Windows, macOS and Linux.
 
 - [Developing the F# Compiler (Windows)](#developing-the-f-compiler-windows)
-- [Developing the F# Compiler (Linux)](#developing-the-f-compiler-linux)
-- [Developing the F# Compiler (macOS)](#developing-the-f-compiler-macos)
+- [Developing the F# Compiler (Linux/macOS)](#developing-the-f-compiler-linuxmacos)
 - [Developing the Visual F# IDE Tools (Windows Only)](#developing-the-visual-f-ide-tools-windows-only)
 - [Notes and Resources](#notes)
 
@@ -27,6 +26,7 @@ Follow the instructions below to build and develop the F# Compiler, Core Library
 Install
 
 - [.NET Framework 4.7.2](https://dotnet.microsoft.com/download/dotnet-framework/net472)
+- [.NET Core 3 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.0)
 
 **NOTE on Windows:**
 
@@ -70,9 +70,7 @@ To build and test Visual F# IDE Tools, install these requirements:
 - Launch the Visual Studio Installer
   - Under the **"Windows"** workload, select **".NET desktop development"**
     - Select the optional component **"F# desktop language support"**
-  - Under the **"Mobile & Gaming"** workload, select **"Mobile development with .NET"**
   - Under the **"Other Toolsets"** workload, select **"Visual Studio extension development"**
-  - On the **"Individual Components"** tab, select **".NET Framework 4.7.2 SDK"** and **".NET Framework 4.7.2 targeting pack"**
 
 Steps to build:
 

FSharpBuild.Directory.Build.targets

@@ -1,26 +1,63 @@
 <Project>
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+  <Import Project="eng\targets\Imports.targets" />
   <Import Project="eng\targets\NuGet.targets" />
   <Import Project="eng\targets\NGenBinaries.targets" />
   <Import Project="FSharp.Profiles.props" />
 
-  <PropertyGroup>
-    <CompileDependsOn>$(CompileDependsOn);CopyAndSubstituteTextFiles</CompileDependsOn>
-  </PropertyGroup>
-
   <Target Name="CopyAndSubstituteTextFiles"
           Inputs="@(CopyAndSubstituteText)"
-          Outputs="@(CopyAndSubstituteText->'$(OutDir)%(TargetFilename)')">
+          Outputs="@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
+          BeforeTargets="BeforeBuild">
+
     <PropertyGroup>
+      <__TargetFilePath>@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
+      <__TargetFileName>@(CopyAndSubstituteText->'%(Filename)%(Extension)')</__TargetFileName>
+
       <_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)'))</_ReplacementText>
       <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)'))</_ReplacementText>
       <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)'))</_ReplacementText>
     </PropertyGroup>
-    <WriteLinesToFile File="$(OutDir)%(CopyAndSubstituteText.TargetFilename)" Lines="$(_ReplacementText)" Overwrite="true" />
+
+    <MakeDir
+      Directories="$(IntermediateOutputPath)"
+      Condition="!Exists('$(IntermediateOutputPath)')" />
+    <WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" WriteOnlyWhenDifferent="true" />
+
+    <!-- Make sure it will get cleaned  -->
+    <ItemGroup >
+      <None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' == 'App.config'" CopyToOutputDirectory="Never" />
+      <None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" CopyToOutputDirectory="PreserveNewest" />
+      <FileWrites Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_GenerateBuildPropertiesFile"
+          Outputs="$(IntermediateOutputPath)buildproperties.fs"
+          BeforeTargets="BeforeBuild"
+          Condition="'$(Language)'=='F#'">
+
+    <ItemGroup>
+      <_BuildPropertyLines Remove="@(_BuildPropertyLines)" />
+      <_BuildPropertyLines Include="//  &lt;auto-generated &gt;" />
+      <_BuildPropertyLines Include="//    &lt;Generated by the FSharp WriteCodeFragment class./&gt;" />
+      <_BuildPropertyLines Include="//  &lt;/auto-generated/&gt;" />
+      <_BuildPropertyLines Include="//" />
+      <_BuildPropertyLines Include="module internal FSharp.BuildProperties" />
+      <_BuildPropertyLines Include="let fsProductVersion = &quot;$(FSPRODUCTVERSION)&quot;" />
+      <_BuildPropertyLines Include="let fsLanguageVersion = &quot;$(FSLANGUAGEVERSION)&quot;" />
+    </ItemGroup>
+
+    <MakeDir
+      Directories="$(IntermediateOutputPath)"
+      Condition="!Exists('$(IntermediateOutputPath)')" />
+    <WriteLinesToFile File="$(IntermediateOutputPath)buildproperties.fs" Lines="@(_BuildPropertyLines)" Overwrite="true" WriteOnlyWhenDifferent="true" />
+
     <!-- Make sure it will get cleaned  -->
-    <CreateItem Include="$(OutDir)%(CopyAndSubstituteText.TargetFilename)">
-      <Output TaskParameter="Include" ItemName="FileWrites" />
-    </CreateItem>
+    <ItemGroup>
+      <FileWrites Include="$(IntermediateOutputPath)buildproperties.fs" />
+      <CompileBefore Include="$(IntermediateOutputPath)buildproperties.fs" />
+    </ItemGroup>
   </Target>
 
 </Project>