Skip to content

Commit 1db43d0

Browse files
AviAvniAviAvni
committed
Merge pull request #2 from Microsoft/master
Merge branch 'master'
2 parents da4ead5 + b846c90 commit 1db43d0

File tree

449 files changed

+6374
-28666
lines changed

Some content is hidden

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

449 files changed

+6374
-28666
lines changed

‎.gitignore

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,62 @@
1+
/packages
2+
/Tools
3+
/src/*.userprefs
4+
/src/fsharp/FSStrings.resources
5+
/src/fsharp/FSharp.Build/*.resx
6+
/src/fsharp/FSharp.Build-proto/*.resx
7+
/src/fsharp/FSharp.Build-proto/*.resources
8+
/src/fsharp/FSharp.Compiler-proto/*.resx
9+
/src/fsharp/FSharp.Compiler-proto/*.resources
10+
/src/fsharp/FSharp.Compiler-proto/*.sln
11+
/src/fsharp/FSharp.Compiler-proto/*.userprefs
12+
/src/fsharp/fsi/*.resx
13+
/src/fsharp/FSharp.Compiler.Interactive.Settings/*.resx
14+
/src/fsharp/FSharp.Compiler.Server.Shared/*.resx
15+
/src/fsharp/fsi/Fsi.sln
16+
/src/fsharp/FSharp.Build/*.resources
17+
/src/fsharp/FSharp.Compiler/*.resx
18+
/src/fsharp/FSharp.Compiler/*.resources
19+
/src/fsharp/FSharp.Compiler/*.sln
20+
/src/fsharp/FSharp.Compiler/*.userprefs
21+
/src/*.log
22+
/src/fsharp/FSharp.Compiler/illex.fs
23+
/src/fsharp/FSharp.Compiler/ilpars.fs
24+
/src/fsharp/FSharp.Compiler/ilpars.fsi
25+
/src/fsharp/FSharp.Compiler/lex.fs
26+
/src/fsharp/FSharp.Compiler/pars.fs
27+
/src/fsharp/FSharp.Compiler/pars.fsi
28+
/src/fsharp/FSharp.Compiler/pplex.fs
29+
/src/fsharp/FSharp.Compiler/pppars.fs
30+
/src/fsharp/FSharp.Compiler/pppars.fsi
31+
/src/fsharp/FSharp.Compiler-proto/illex.fs
32+
/src/fsharp/FSharp.Compiler-proto/ilpars.fs
33+
/src/fsharp/FSharp.Compiler-proto/ilpars.fsi
34+
/src/fsharp/FSharp.Compiler-proto/lex.fs
35+
/src/fsharp/FSharp.Compiler-proto/pars.fs
36+
/src/fsharp/FSharp.Compiler-proto/pars.fsi
37+
/src/fsharp/FSharp.Compiler-proto/pplex.fs
38+
/src/fsharp/FSharp.Compiler-proto/pppars.fs
39+
/src/fsharp/FSharp.Compiler-proto/pppars.fsi
40+
/src/fsharp/FSharp.LanguageService.Compiler/illex.*
41+
/src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
42+
/src/fsharp/FSharp.LanguageService.Compiler/lex.*
43+
/src/fsharp/FSharp.LanguageService.Compiler/pars.*
44+
/src/fsharp/FSharp.LanguageService.Compiler/pplex.fs
45+
/src/fsharp/FSharp.LanguageService.Compiler/pppars.fs
46+
/src/fsharp/FSharp.LanguageService.Compiler/pppars.fsi
47+
/vsintegration/src/unittests/Unittests.fsi
48+
/tests/*FSharp_Failures.env
49+
/tests/*FSharp_Failures.lst
50+
/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
51+
/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
52+
/tests/XFSharpQA_Failures.log.*
53+
/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
54+
/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
55+
/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
56+
/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
57+
/tests/fsharpqa/Source/*FSharpQA_Failures.env
58+
/tests/fsharpqa/Source/*FSharpQA_Failures.lst
59+
/tests/**/FSharp.Core.dll
160
lib/debug
261
lib/release
362
lib/proto
@@ -7,26 +66,6 @@ lib/bootstrap/4.1/fsharpc
766
lib/bootstrap/4.1/fsharpi
867
lib/bootstrap/4.1/policy*
968
aclocal.m4
10-
src/*.userprefs
11-
src/fsharp/FSStrings.resources
12-
packages
13-
src/fsharp/FSharp.Build/*.resx
14-
src/fsharp/FSharp.Build-proto/*.resx
15-
src/fsharp/FSharp.Build-proto/*.resources
16-
src/fsharp/FSharp.Compiler-proto/*.resx
17-
src/fsharp/FSharp.Compiler-proto/*.resources
18-
src/fsharp/FSharp.Compiler-proto/*.sln
19-
src/fsharp/FSharp.Compiler-proto/*.userprefs
20-
src/fsharp/fsi/*.resx
21-
src/fsharp/FSharp.Compiler.Interactive.Settings/*.resx
22-
src/fsharp/FSharp.Compiler.Server.Shared/*.resx
23-
src/fsharp/fsi/Fsi.sln
24-
src/fsharp/FSharp.Build/*.resources
25-
src/fsharp/FSharp.Compiler/*.resx
26-
src/fsharp/FSharp.Compiler/*.resources
27-
src/fsharp/FSharp.Compiler/*.sln
28-
src/fsharp/FSharp.Compiler/*.userprefs
29-
src/*.log
3069
Debug
3170
Release
3271
Proto
@@ -39,51 +78,11 @@ autom4te.cache
3978
config.log
4079
config.make
4180
config.status
42-
src/fsharp/FSharp.Compiler/illex.fs
43-
src/fsharp/FSharp.Compiler/ilpars.fs
44-
src/fsharp/FSharp.Compiler/ilpars.fsi
45-
src/fsharp/FSharp.Compiler/lex.fs
46-
src/fsharp/FSharp.Compiler/pars.fs
47-
src/fsharp/FSharp.Compiler/pars.fsi
48-
src/fsharp/FSharp.Compiler/pplex.fs
49-
src/fsharp/FSharp.Compiler/pppars.fs
50-
src/fsharp/FSharp.Compiler/pppars.fsi
51-
src/fsharp/FSharp.Compiler-proto/illex.fs
52-
src/fsharp/FSharp.Compiler-proto/ilpars.fs
53-
src/fsharp/FSharp.Compiler-proto/ilpars.fsi
54-
src/fsharp/FSharp.Compiler-proto/lex.fs
55-
src/fsharp/FSharp.Compiler-proto/pars.fs
56-
src/fsharp/FSharp.Compiler-proto/pars.fsi
57-
src/fsharp/FSharp.Compiler-proto/pplex.fs
58-
src/fsharp/FSharp.Compiler-proto/pppars.fs
59-
src/fsharp/FSharp.Compiler-proto/pppars.fsi
6081
*~
61-
tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.sln
62-
tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.userprefs
6382
*.suo
6483
obj
6584
extras
6685
ossreadme*.txt
67-
src/fsharp/FSharp.LanguageService.Compiler/illex.*
68-
src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
69-
src/fsharp/FSharp.LanguageService.Compiler/lex.*
70-
src/fsharp/FSharp.LanguageService.Compiler/pars.*
71-
src/fsharp/FSharp.LanguageService.Compiler/pplex.fs
72-
src/fsharp/FSharp.LanguageService.Compiler/pppars.fs
73-
src/fsharp/FSharp.LanguageService.Compiler/pppars.fsi
74-
vsintegration/src/unittests/Unittests.fsi
75-
vsintegration/src/FSharp.ProjectSystem.FSharp/ctofiles/MenusAndCommands.cto
76-
tests/*FSharp_Failures.env
77-
tests/*FSharp_Failures.lst
78-
tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
79-
tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
80-
tests/XFSharpQA_Failures.log.*
81-
vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
82-
vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
83-
tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
84-
tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
85-
tests/fsharpqa/Source/*FSharpQA_Failures.env
86-
tests/fsharpqa/Source/*FSharpQA_Failures.lst
8786
*.csproj.user
8887
*.sln.DotSettings.user
8988
*.ide
@@ -95,5 +94,6 @@ tests/fsharpqa/Source/*FSharpQA_Failures.lst
9594
*.mdf
9695
*.ldf
9796
*.cto
98-
tests/**/FSharp.Core.dll
9997
project.lock.json
98+
Tools/
99+
Backup/

‎.nuget/NuGet.exe

68.5 KB
Binary file not shown.

‎BuildToolsVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.25-prerelease-00317-01
1+
1.0.25-prerelease-00404-01

‎DEVGUIDE.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,29 @@ There are various qualifiers:
3030
build.cmd release -- build release (the default)
3131
build.cmd debug -- build debug instead of release
3232

33+
build.cmd proto -- force the rebuild of the Proto bootstrap compiler in addition to other things
34+
35+
build.cmd coreclr -- build/tests only the coreclr version compiler (not the Visual F# IDE Tools)
3336
build.cmd compiler -- build/tests only the compiler (not the Visual F# IDE Tools)
3437
build.cmd vs -- build/tests the Visual F# IDE Tools
3538
build.cmd pcls -- build/tests the PCL FSharp.Core libraries
3639

3740
build.cmd build -- build, do not test
38-
build.cmd smoke -- build, run smoke tests
3941
build.cmd ci -- build, run the same tests as CI
4042
build.cmd all -- build, run all tests
43+
build.cmd notests -- turn off testing (used in conjunction with other options)
44+
45+
build.cmd test-smoke -- build, run smoke tests
46+
build.cmd test-coreunit -- build, run FSharp.Core tests
47+
build.cmd test-coreclr -- build, run CoreCLR tests
48+
build.cmd test-pcls -- build, run PCL tests
49+
build.cmd test-fsharp -- build, run tests\fsharp suite
50+
build.cmd test-fsharpqa -- build, run tests\fsharpqa suite
51+
build.cmd test-vs -- build, run Visual F# IDE Tools unit tests
4152

4253
Combinations are also allowed:
4354

44-
build.cmd debug,compiler,smoke -- build the debug compiler and run smoke tests
55+
build.cmd debug,compiler,notests -- build the debug compiler and run smoke tests
4556

4657
After you build the first time you can open and use this solution:
4758

@@ -136,8 +147,8 @@ For **Release** this corresponds to these steps, which you can run individually
136147

137148
### 4. [Optional] Install the Visual F# IDE Tools
138149

139-
**Note:** This step will install a VSIX extension into Visual Studio 2015 that changes the Visual F# IDE Tools
140-
components installed into Visual Studio 2015. You can revert this step by disabling or uninstalling the addin.
150+
**Note:** This step will install a VSIX extension into Visual Studio 15 that changes the Visual F# IDE Tools
151+
components installed into Visual Studio 15. You can revert this step by disabling or uninstalling the addin.
141152

142153
For **Debug**:
143154

@@ -153,7 +164,7 @@ Restart Visual Studio, it should now be running your freshly-built Visual F# IDE
153164

154165
### 5. [Optional] Clobber the F# SDK on the machine
155166

156-
**Note:** Step #3 below will clobber the machine-wide installed F# SDK on your machine. This replaces the ``fsi.exe``/``fsiAnyCpu.exe`` used by Visual F# Interactive and the ``fsc.exe`` used by ``Microsoft.FSharp.targets``. Repairing Visual Studio 2015 is currently the only way to revert this step.
167+
**Note:** Step #3 below will clobber the machine-wide installed F# SDK on your machine. This replaces the ``fsi.exe``/``fsiAnyCpu.exe`` used by Visual F# Interactive and the ``fsc.exe`` used by ``Microsoft.FSharp.targets``. Repairing Visual Studio 15 is currently the only way to revert this step.
157168

158169
For **Debug**:
159170

@@ -163,7 +174,6 @@ For **Release**:
163174

164175
1. Run ``vsintegration\update-vsintegration.cmd release`` (clobbers the installed F# SDK)
165176

166-
167177
### Notes on the build
168178

169179
1. The `update.cmd` script adds required strong name validation skips, and NGens the compiler and libraries. This requires admin privileges.

‎DotnetCLIVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.0-beta-002173
1+
1.0.0-rc2-002665

‎README.md

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
## Windows build
77

8-
| |Debug (Build only)|Release (Build only)|Release (Build and tests)|
8+
| |Debug (Build only)|Release (Tests Part 1)|Release (Tests Part 2)|
99
|:----------:|:----------------:|:------------------:|:-----------------------:|
10-
|**master** |[![Build Status](http://dotnet-ci.cloudapp.net/buildStatus/icon?job=Microsoft_visualfsharp/master/debug_windows_nt)](http://dotnet-ci.cloudapp.net/job/Microsoft_visualfsharp/job/master/job/debug_windows_nt/)|[![Build Status](http://dotnet-ci.cloudapp.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_windows_nt)](http://dotnet-ci.cloudapp.net/job/Microsoft_visualfsharp/job/master/job/release_windows_nt/)| [![Build status](https://img.shields.io/appveyor/ci/KevinRansom/visualfsharp-radou/master.svg)](https://ci.appveyor.com/project/KevinRansom/visualfsharp-radou/branch/master) |
11-
|**vs2015** ||| [![Build status](https://img.shields.io/appveyor/ci/KevinRansom/visualfsharp-radou/vs2015.svg)](https://ci.appveyor.com/project/KevinRansom/visualfsharp-radou/branch/vs2015) |
12-
|**coreclr** ||| [![Build status](https://img.shields.io/appveyor/ci/KevinRansom/visualfsharp-radou/coreclr.svg)](https://ci.appveyor.com/project/KevinRansom/visualfsharp-radou/branch/coreclr) |
10+
|**master** |[![Build Status](http://dotnet-ci.cloudapp.net/buildStatus/icon?job=Microsoft_visualfsharp/master/debug_windows_nt)](http://dotnet-ci.cloudapp.net/job/Microsoft_visualfsharp/job/master/job/debug_windows_nt/)|[![Build Status](http://dotnet-ci.cloudapp.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part1_windows_nt)](http://dotnet-ci.cloudapp.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part1_windows_nt/)|[![Build Status](http://dotnet-ci.cloudapp.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part2_windows_nt)](http://dotnet-ci.cloudapp.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part2_windows_nt/)|
11+
|**vs2015** ||||
12+
|**roslyn** ||||
1313

1414
###Contributing to the F# Language, Library, and Tools
1515

@@ -38,18 +38,30 @@ Quickstart guides for build and test can be found [here](https://github.com/Micr
3838

3939
####Development tools
4040

41-
For F# 4.0+ development
41+
For F# 4.0 development
4242

4343
- [Visual Studio 2015](http://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs)
44+
- Select Visual C++ / Common Tools For Visual C++
45+
- Visual F#
46+
- Visual Studio Extensibility Tools
4447
- [Visual Studio 2015 SDK](http://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs)
4548

49+
For F# 4.1 development
50+
51+
- [Visual Studio 15](https://www.visualstudio.com/en-us/downloads/visual-studio-next-downloads-vs.aspx)
52+
- Select Visual C++ / Common Tools For Visual C++
53+
- Visual F#
54+
- Visual Studio Extensibility Tools
55+
- [Visual Studio 15 SDK](https://www.visualstudio.com/en-us/downloads/visual-studio-next-downloads-vs.aspx)
56+
4657
####Additional frameworks
4758

4859
- [Git for windows](http://msysgit.github.io/)
4960
- [Perl](http://www.perl.org/get.html#win32) (ActiveState 5.16.3 is known to be supported)
5061
- [.NET 3.5](http://www.microsoft.com/en-us/download/details.aspx?id=21)
5162
- [.NET 4.5](http://www.microsoft.com/en-us/download/details.aspx?id=30653)
5263
- [.NET 4.5.1](http://www.microsoft.com/en-us/download/details.aspx?id=40779)
64+
- [.NET 4.6](http://www.microsoft.com/en-us/download/details.aspx?id=48137)
5365
- [MSBuild 12.0](http://www.microsoft.com/en-us/download/details.aspx?id=40760)
5466
- [Windows 7 SDK](http://www.microsoft.com/en-us/download/details.aspx?id=8279)
5567
- [Windows 8 SDK](http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx)

‎VisualFSharp.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.0.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnableOpenSource", "vsintegration\deployment\EnableOpenSource\EnableOpenSource.csproj", "{4D7BE558-E6BF-44DA-8CE2-46AA6E0DC2E7}"
77
EndProject

‎appveyor.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ build_script:
1313

1414
# scripts that run after cloning repository
1515
install:
16-
# by default, all script lines are interpreted as batch
16+
# by default, all script lines are interpreted as batch
17+
# The newest version of MSBuild installed will overwrite the older ones.
18+
- set PATH=%ProgramFiles(x86)%\MSBuild\12.0\Bin;%PATH%
19+
- set PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin;%PATH%
20+
- set PATH=%ProgramFiles(x86)%\MSBuild\15.0\Bin;%PATH%
1721

1822
test: off
1923
version: 0.0.1.{build}

0 commit comments

Comments
 (0)