Skip to content

Commit 8be9a9a

Browse files
baronfelbaronfel
authored
Integrate dotnet/fsharp master from 419a4c7 (2019-05-03) to 25560f4 (2019-05-24) (#903)
Integrate dotnet/fsharp master from 419a4c7 (2019-05-03) to 25560f4 (2019-05-24)
2 parents 1e21454 + 77644a6 commit 8be9a9a

File tree

93 files changed

+1482
-974
lines changed

Some content is hidden

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

93 files changed

+1482
-974
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

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)

‎.github/ISSUE_TEMPLATE/feature_request.md

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.

‎.vsconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,13 @@
1515
"Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
1616
"Microsoft.Component.MSBuild",
1717
"Microsoft.VisualStudio.Component.TextTemplating",
18-
"Microsoft.VisualStudio.Component.SQL.CLR",
1918
"Microsoft.VisualStudio.Component.ManagedDesktop.Core",
2019
"Microsoft.Net.Component.4.6.TargetingPack",
21-
"Component.Microsoft.VisualStudio.LiveShare",
2220
"Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
23-
"Microsoft.VisualStudio.Component.Debugger.JustInTime",
2421
"Microsoft.VisualStudio.Component.FSharp.Desktop",
2522
"Microsoft.VisualStudio.Workload.ManagedDesktop",
2623
"Microsoft.VisualStudio.Component.VSSDK",
2724
"Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites",
2825
"Microsoft.VisualStudio.Workload.VisualStudioExtension"
2926
]
30-
}
27+
}

‎.vsts-pr.yaml

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

‎FSharpBuild.Directory.Build.targets

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,63 @@
11
<Project>
22
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
3+
<Import Project="eng\targets\Imports.targets" />
34
<Import Project="eng\targets\NuGet.targets" />
45
<Import Project="eng\targets\NGenBinaries.targets" />
56
<Import Project="FSharp.Profiles.props" />
67

7-
<PropertyGroup>
8-
<CompileDependsOn>$(CompileDependsOn);CopyAndSubstituteTextFiles</CompileDependsOn>
9-
</PropertyGroup>
10-
118
<Target Name="CopyAndSubstituteTextFiles"
129
Inputs="@(CopyAndSubstituteText)"
13-
Outputs="@(CopyAndSubstituteText->'$(OutDir)%(TargetFilename)')">
10+
Outputs="@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
11+
BeforeTargets="BeforeBuild">
12+
1413
<PropertyGroup>
14+
<__TargetFilePath>@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
15+
<__TargetFileName>@(CopyAndSubstituteText->'%(Filename)%(Extension)')</__TargetFileName>
16+
1517
<_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)'))</_ReplacementText>
1618
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)'))</_ReplacementText>
1719
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)'))</_ReplacementText>
1820
</PropertyGroup>
19-
<WriteLinesToFile File="$(OutDir)%(CopyAndSubstituteText.TargetFilename)" Lines="$(_ReplacementText)" Overwrite="true" />
21+
22+
<MakeDir
23+
Directories="$(IntermediateOutputPath)"
24+
Condition="!Exists('$(IntermediateOutputPath)')" />
25+
<WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" WriteOnlyWhenDifferent="true" />
26+
27+
<!-- Make sure it will get cleaned -->
28+
<ItemGroup >
29+
<None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' == 'App.config'" CopyToOutputDirectory="Never" />
30+
<None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" CopyToOutputDirectory="PreserveNewest" />
31+
<FileWrites Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" />
32+
</ItemGroup>
33+
</Target>
34+
35+
<Target Name="_GenerateBuildPropertiesFile"
36+
Outputs="$(IntermediateOutputPath)buildproperties.fs"
37+
BeforeTargets="BeforeBuild"
38+
Condition="'$(Language)'=='F#'">
39+
40+
<ItemGroup>
41+
<_BuildPropertyLines Remove="@(_BuildPropertyLines)" />
42+
<_BuildPropertyLines Include="// &lt;auto-generated &gt;" />
43+
<_BuildPropertyLines Include="// &lt;Generated by the FSharp WriteCodeFragment class./&gt;" />
44+
<_BuildPropertyLines Include="// &lt;/auto-generated/&gt;" />
45+
<_BuildPropertyLines Include="//" />
46+
<_BuildPropertyLines Include="module internal FSharp.BuildProperties" />
47+
<_BuildPropertyLines Include="let fsProductVersion = &quot;$(FSPRODUCTVERSION)&quot;" />
48+
<_BuildPropertyLines Include="let fsLanguageVersion = &quot;$(FSLANGUAGEVERSION)&quot;" />
49+
</ItemGroup>
50+
51+
<MakeDir
52+
Directories="$(IntermediateOutputPath)"
53+
Condition="!Exists('$(IntermediateOutputPath)')" />
54+
<WriteLinesToFile File="$(IntermediateOutputPath)buildproperties.fs" Lines="@(_BuildPropertyLines)" Overwrite="true" WriteOnlyWhenDifferent="true" />
55+
2056
<!-- Make sure it will get cleaned -->
21-
<CreateItem Include="$(OutDir)%(CopyAndSubstituteText.TargetFilename)">
22-
<Output TaskParameter="Include" ItemName="FileWrites" />
23-
</CreateItem>
57+
<ItemGroup>
58+
<FileWrites Include="$(IntermediateOutputPath)buildproperties.fs" />
59+
<CompileBefore Include="$(IntermediateOutputPath)buildproperties.fs" />
60+
</ItemGroup>
2461
</Target>
2562

2663
</Project>

‎ISSUE_TEMPLATE.md

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

0 commit comments

Comments
 (0)