Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite03b5ba

Browse files
authored
Merge branch 'master' into codelensfixes
2 parents992ca9e +c1b5aa5 commite03b5ba

File tree

404 files changed

+4441
-3807
lines changed

Some content is hidden

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

404 files changed

+4441
-3807
lines changed

‎.vsts-pr.yaml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
phases:
2+
-phase:Linux
3+
queue:
4+
name:Hosted Linux Preview
5+
timeoutInMinutes:90
6+
parallel:2
7+
matrix:
8+
release_default:
9+
_command:./mono/cibuild.sh
10+
_args:release
11+
# disabled until it can be properly fixed
12+
#release_fcs:
13+
# _command: ./fcs/build.sh
14+
# _args: Build
15+
steps:
16+
-script:$(_command) $(_args)
17+
-task:PublishBuildArtifacts@1
18+
inputs:
19+
PathtoPublish:'$(Build.SourcesDirectory)/tests/TestResults'
20+
ArtifactName:'Linux $(_command) $(_args)'
21+
publishLocation:Container
22+
continueOnError:true
23+
condition:failed()
24+
25+
-phase:Windows
26+
queue:
27+
name:Hosted VS2017
28+
timeoutInMinutes:90
29+
parallel:7
30+
matrix:
31+
ci_part1:
32+
_command:build.cmd
33+
_args:release ci_part1
34+
ci_part2:
35+
_command:build.cmd
36+
_args:release ci_part2
37+
ci_part3:
38+
_command:build.cmd
39+
_args:release ci_part3
40+
ci_part4:
41+
_command:build.cmd
42+
_args:release ci_part4
43+
debug_default:
44+
_command:build.cmd
45+
_args:debug
46+
net40_no_vs:
47+
_command:build.cmd
48+
_args:release net40
49+
release_fcs:
50+
_command:fcs\build.cmd
51+
_args:TestAndNuget
52+
steps:
53+
-script:$(_command) $(_args)
54+
-task:PublishBuildArtifacts@1
55+
inputs:
56+
PathtoPublish:'$(Build.SourcesDirectory)\tests\TestResults'
57+
ArtifactName:'Windows $(_command) $(_args)'
58+
publishLocation:Container
59+
continueOnError:true
60+
condition:failed()

‎.vsts-ci.yaml‎renamed to ‎.vsts-signed.yaml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
queue:
22
name:VSEng-MicroBuildVS2017
33
timeoutInMinutes:300
4-
demands:
4+
demands:
55
-visualstudio
66
-DotNetFramework
77
-msbuild
@@ -34,7 +34,7 @@ steps:
3434
inputs:
3535
scriptName:'setup\publish-assets.ps1'
3636
arguments:'-binariesPath $(MSBuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)'
37-
condition:and(succeeded(), contains(variables['PB_PublishType'], 'myget'), in(variables['Build.SourceBranchName'], 'master', 'dev15.7', 'dev15.8'))
37+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'myget'))
3838

3939
# Publish packages to Azure Blob Storage
4040
-task:MSBuild@1
@@ -44,13 +44,6 @@ steps:
4444
msbuildArguments:'/t:Build /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:AccountKey=$(PB_PublishBlobFeedKey) /p:ManifestBranch=$(SourceBranch) /p:ManifestCommit=$(SourceVersion) /p:ManifestBuildId=$(OfficialBuildId)'
4545
condition:and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
4646

47-
# Run BinSkim
48-
-task:securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@3
49-
displayName:Run BinSkim
50-
inputs:
51-
arguments:'analyze "$(MSBuildConfiguration)\*.dll" "$(MSBuildConfiguration)\*.exe" --recurse --output "$(MSBuildConfiguration)\artifacts"'
52-
continueOnError:true
53-
5447
# Create static drop
5548
-task:PublishBuildArtifacts@1
5649
displayName:Create static drop

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ Contributions to this repository will be rigorously policed for quality.
6868

6969
All code submissions should be submitted with regression test cases, and will be subject to peer review by the community and Microsoft. The bar for contributions will be high. This will result in a higher-quality, more stable product.
7070

71-
- We expect contributors to be actively involved in quality assurance.
72-
- We expect contributors to be actively involved in quality assurance.
7371
- We expect contributors to be actively involved in quality assurance.
7472
- Partial, incomplete, or poorly-tested contributions will not be accepted.
7573
- Contributions may be put on hold according to stability, testing, and design-coherence requirements.

‎DEVGUIDE.md‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
#Development Guide
22

3+
##Get the Latest F# Compiler Source Code
4+
5+
Get the latest source code from the master branch by running this git command:
6+
7+
git clone https://github.com/Microsoft/visualfsharp.git
8+
9+
Before running the build scripts, ensure that you have cleaned up the visualfsharp repo by running this git command:
10+
11+
git clean -xfd
12+
13+
This will remove any files that are not under version control. This is necessary only if you have already attempted to build the solution or have made other changes that might prevent it from building.
14+
15+
##Installing Dependencies and Building
16+
317
Follow the instructions below to build and develop the F# Compiler, Core Library and tools on Windows, macOS and Linux.
418

519
-[Developing the F# Compiler (Windows)](#developing-the-f-compiler-windows)
@@ -20,10 +34,6 @@ Install
2034

2135
2. The command prompt must have Administrator rights (`Run as Administrator`).
2236

23-
Before running the build scripts, ensure that you have cleaned up the visualfsharp repo by running this git command:
24-
25-
git clean -xfd
26-
2737
On Windows you can build the F# compiler for .NET Framework as follows:
2838

2939
build.cmd
@@ -195,7 +205,11 @@ For **Release**:
195205

196206
vsintegration\update-vsintegration.cmd release
197207

198-
#Notes
208+
##Debugging the F# Compiler
209+
210+
See the "Debugging The Compiler" section of this[article](https://medium.com/@willie.tetlow/f-mentorship-week-1-36f51d3812d4)
211+
212+
##Notes
199213

200214
####Windows: Links to Additional frameworks
201215

‎DotnetCLIToolsVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.300-rtm-008707
1+
2.1.400-preview-009197

‎FSharp.sln‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{B8DDA694
3939
EndProject
4040
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Libraries","Libraries","{3058BC79-8E79-4645-B05D-48CC182FA8A6}"
4141
EndProject
42+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="fsharpqafiles","tests\fsharpqa\fsharpqafiles.csproj","{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}"
43+
EndProject
4244
Global
4345
GlobalSection(SolutionConfigurationPlatforms) =preSolution
4446
Debug|Any CPU=Debug|Any CPU
@@ -181,6 +183,17 @@ Global
181183
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|Any CPU.Build.0=Release|Any CPU
182184
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|x86.ActiveCfg=Release|Any CPU
183185
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|x86.Build.0=Release|Any CPU
186+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Debug|Any CPU.ActiveCfg=Debug|x86
187+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Debug|x86.ActiveCfg=Debug|x86
188+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Debug|x86.Build.0=Debug|x86
189+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Proto|Any CPU.ActiveCfg=Debug|x86
190+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Proto|Any CPU.Build.0=Debug|x86
191+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Proto|x86.ActiveCfg=Debug|x86
192+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Proto|x86.Build.0=Debug|x86
193+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Release|Any CPU.ActiveCfg=Debug|x86
194+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Release|Any CPU.Build.0=Debug|x86
195+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Release|x86.ActiveCfg=Debug|x86
196+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Release|x86.Build.0=Debug|x86
184197
EndGlobalSection
185198
GlobalSection(SolutionProperties) =preSolution
186199
HideSolutionNode =FALSE
@@ -197,5 +210,9 @@ Global
197210
{C163E892-5BF7-4B59-AA99-B0E8079C67C4} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
198211
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
199212
{88E2D422-6852-46E3-A740-83E391DC7973} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
213+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
214+
EndGlobalSection
215+
GlobalSection(ExtensibilityGlobals) =postSolution
216+
SolutionGuid ={BD5177C7-1380-40E7-94D2-7768E1A8B1B8}
200217
EndGlobalSection
201218
EndGlobal

‎FSharpBuild.Directory.Build.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
<MessageText="Copying build artifacts to $(FinalOutputPath)" />
3131
<MakeDirDirectories="$(FinalOutputPath);$(FinalIntermediateOutputPath)" />
32-
<CopySourceFiles="@(OutputFilesToCopy)"DestinationFolder="$(FinalOutputPath)" />
33-
<CopySourceFiles="@(IntermediateFilesToCopy)"DestinationFolder="$(FinalIntermediateOutputPath)" />
32+
<CopySourceFiles="@(OutputFilesToCopy)"DestinationFolder="$(FinalOutputPath)\%(RecursiveDir)" />
33+
<CopySourceFiles="@(IntermediateFilesToCopy)"DestinationFolder="$(FinalIntermediateOutputPath)\%(RecursiveDir)" />
3434
</Target>
3535

3636
<ImportProject="build\targets\AssemblyVersions.props" />

‎README.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ For historical reasons this repository is called "visualfsharp" and currently al
1616

1717
##Build Status
1818

19-
|| Ubuntu (Build)| Windows (Debug Build)| Windows (Release Tests 1)| Windows (Release Tests 2)| Windows (Release Tests 3)| Windows (Release Tests 4)|
20-
|:----------:|:----------------:|:----------------:|:------------------:|:-----------------------:|:---------------------:|:---------------------:|
21-
|**master** |[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ubuntu14.04)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ubuntu14.04/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/debug_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/debug_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part1_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part1_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part2_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part2_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part3_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part3_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part4_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part4_windows_nt/)|
22-
**dev15.6** |[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.6/release_ubuntu14.04)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.6/job/release_ubuntu14.04/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.6/debug_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.6/job/debug_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.6/release_ci_part1_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.6/job/release_ci_part1_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.6/release_ci_part2_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.6/job/release_ci_part2_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.6/release_ci_part3_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.6/job/release_ci_part3_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.6/release_ci_part4_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.6/job/release_ci_part4_windows_nt/)|
23-
**dev15.7** |[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.7/release_ubuntu14.04)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.7/job/release_ubuntu14.04/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.7/debug_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.7/job/debug_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.7/release_ci_part1_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.7/job/release_ci_part1_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.7/release_ci_part2_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.7/job/release_ci_part2_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.7/release_ci_part3_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.7/job/release_ci_part3_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.7/release_ci_part4_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.7/job/release_ci_part4_windows_nt/)|
24-
**dev15.8** |[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.8/release_ubuntu14.04)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.8/job/release_ubuntu14.04/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.8/debug_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.8/job/debug_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.8/release_ci_part1_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.8/job/release_ci_part1_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.8/release_ci_part2_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.8/job/release_ci_part2_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.8/release_ci_part3_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.8/job/release_ci_part3_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/dev15.8/release_ci_part4_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/dev15.8/job/release_ci_part4_windows_nt/)|
19+
| Branch| Status|
20+
|:------:|:------:|
21+
|master|[![Build Status](https://dnceng.visualstudio.com/_apis/public/build/definitions/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/106/badge?branchname=master)](https://dnceng.visualstudio.com/public/public%20Team/_build?definitionId=106&_a=history)|
22+
|dev15.9|[![Build Status](https://dnceng.visualstudio.com/_apis/public/build/definitions/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/106/badge?branchname=dev15.9)](https://dnceng.visualstudio.com/public/public%20Team/_build?definitionId=106&_a=history)|
23+
|dev16.0|[![Build Status](https://dnceng.visualstudio.com/_apis/public/build/definitions/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/106/badge?branchname=dev16.0)](https://dnceng.visualstudio.com/public/public%20Team/_build?definitionId=106&_a=history)|
2524

2625
##Help improve the Quality of the Tools by Using the Nightly Releases of Visual F# Tools
2726
To setup Visual Studio to use the latest nightly releases of the Visual F# Tools:

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.8.0
1+
2.9.0-beta8-63208-01

‎TESTGUIDE.md‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ To run tests, use variations such as the following, depending on which test suit
1212

1313
##Prerequisites
1414

15-
In order to run the FSharpQA suite, you will need to install[Perl](http://www.perl.org/get.html) (ActiveState Perl 5.16.3 is known to work fine).
16-
Perl must be included in the`%PATH%` for the below steps to work. It is also recommended that you run tests from an elevated command prompt, as there are a couple of test cases which require administrative privileges.
17-
18-
The Perl requirement is gradually being removed.
15+
It is recommended that you run tests from an elevated command prompt, as there are a couple of test cases which require administrative privileges.
1916

2017
##Test Suites
2118

@@ -47,12 +44,18 @@ See note about baseline under "Other Tips" bellow for tests checking expectation
4744

4845
###FSharpQA Suite
4946

47+
The FSharpQA suite relies on[Perl](http://www.perl.org/get.html), StrawberryPerl64 package from nuget is used automatically by the test suite.
48+
5049
These tests use the`RunAll.pl` framework to execute, however the easiest way to run them is via the`build.cmd` script, see[usage examples](https://github.com/Microsoft/visualfsharp/blob/master/build.cmd#L31).
5150

5251
Tests are grouped in folders per area. Each folder contains a number of source code files and a single`env.lst` file. The`env.lst` file defines a series of test cases, one per line.
53-
Each test case runs an optional "pre command," compiles a given set of source files using given flags, optionally runs the resulting binary, then optionally runs a final "post command."
52+
53+
Each test case runs an optional "pre command," compiles a given set of source files using given flags, optionally runs the resulting binary, then optionally runs a final "post command".
54+
5455
If all of these steps complete without issue, the test is considered to have passed.
5556

57+
Read more at[tests/fsharpqa/readme.md](tests/fsharpqa/readme.md).
58+
5659
####Test lists
5760

5861
For the FSharpQA suite, the list of test areas and their associated "tags" is stored at

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp