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

Commitcec8ada

Browse files
committed
Merge branch 'fsharp4' ofhttp://github.com/Microsoft/visualfsharp into fix-123
2 parents95cc10d +ac85db7 commitcec8ada

File tree

193 files changed

+13994
-93716
lines changed

Some content is hidden

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

193 files changed

+13994
-93716
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ aclocal.m4
1010
src/*.userprefs
1111
src/fsharp/FSStrings.resources
1212
lkg
13-
pack
13+
packages
1414
src/fsharp/FSharp.Build/*.resx
1515
src/fsharp/FSharp.Build-proto/*.resx
1616
src/fsharp/FSharp.Build-proto/*.resources
@@ -30,6 +30,8 @@ src/fsharp/FSharp.Compiler/*.userprefs
3030
src/*.log
3131
Debug
3232
Release
33+
vsdebug
34+
vsrelease
3335
Proto
3436
.libs
3537
Makefile
@@ -99,3 +101,4 @@ tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLi
99101
*.log
100102
*.jrs
101103
*.chk
104+
*.bak

‎DEVGUIDE.md‎

Lines changed: 74 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,29 @@ To get a free F# environment, go to [fsharp.org](http://fsharp.org/use/windows).
1212
1313
**Questions?** If you have questions about the source code, please ask in the issues and discussion forums.
1414

15+
##0. A Shortcut to Build and Smoke Test
16+
17+
You can build a subset of functionality (including bootstrapped compiler and library) and run a very
18+
small number of 'smoke' tests using the script used by continuous integration:
19+
20+
.\appveyor-build.cmd
21+
22+
See the script for what this does. After you do this, you can do further testing, see[TESTGUIDE.md](TESTGUIDE.md).
23+
24+
1525
##1. Building a Proto Compiler
1626

1727
The compiler is compiled as a set of .NET 4.0 components using a bootstrap process. This uses the Last Known Good (LKG) compiler to build.
1828
Note that you need the .NET framework 3.5 installed on your machine in order to complete this step.
1929

20-
```
21-
gacutil /i lkg\FSharp-2.0.50726.900\bin\FSharp.Core.dll
22-
msbuild src\fsharp-proto-build.proj
23-
```
30+
msbuild src\fsharp-proto-build.proj
2431

2532
##2. Building an F# (Debug) library and compiler
2633

2734
This uses the proto compiler to build`FSharp.Core.dll`,`FSharp.Compiler.dll`,`fsc.exe`, and`fsi.exe`.
2835

29-
```
30-
msbuild src/fsharp-library-build.proj
31-
msbuild src/fsharp-compiler-build.proj
32-
```
36+
msbuild src/fsharp-library-build.proj
37+
msbuild src/fsharp-compiler-build.proj
3338

3439
You can now use the updated F# compiler in`debug\net40\bin\fsc.exe` and F# Interactive in`debug\net40\bin\fsi.exe` to develop and test basic language and tool features.
3540

@@ -41,75 +46,81 @@ See [TESTGUIDE.md](TESTGUIDE.md) for full details on how to run tests.
4146

4247
Prior to a**Debug** test run, you need to complete**all** of these steps:
4348

44-
```
45-
msbuild src/fsharp-library-build.proj
46-
msbuild src/fsharp-compiler-build.proj
47-
msbuild src/fsharp-typeproviders-build.proj
48-
msbuild src/fsharp-compiler-unittests-build.proj
49-
msbuild src/fsharp-library-build.proj /p:TargetFramework=net20
50-
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable47
51-
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable7
52-
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable78
53-
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable259
54-
msbuild src/fsharp-library-unittests-build.proj
55-
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47
56-
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7
57-
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78
58-
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259
59-
src\update.cmd debug -ngen
60-
tests\BuildTestTools.cmd debug
61-
```
49+
msbuild src/fsharp-library-build.proj
50+
msbuild src/fsharp-compiler-build.proj
51+
msbuild src/fsharp-typeproviders-build.proj
52+
msbuild src/fsharp-compiler-unittests-build.proj
53+
msbuild src/fsharp-library-build.proj /p:TargetFramework=net20
54+
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable47
55+
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable7
56+
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable78
57+
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable259
58+
msbuild src/fsharp-library-unittests-build.proj
59+
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47
60+
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7
61+
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78
62+
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259
63+
src\update.cmd debug -ngen
64+
tests\BuildTestTools.cmd debug
65+
6266

6367
[Optional] If testing the Visual Studio bits (see below) you will also need:
6468

65-
```
66-
msbuild vsintegration\fsharp-vsintegration-build.proj
67-
msbuild vsintegration\fsharp-vsintegration-unittests-build.proj
68-
```
69+
msbuild vsintegration\fsharp-vsintegration-build.proj
70+
msbuild vsintegration\fsharp-vsintegration-unittests-build.proj
6971

7072
Prior to a**Release** test run, you need to do**all** of these:
7173

72-
```
73-
msbuild src/fsharp-library-build.proj /p:Configuration=Release
74-
msbuild src/fsharp-compiler-build.proj /p:Configuration=Release
75-
msbuild src/fsharp-typeproviders-build.proj /p:Configuration=Release
76-
msbuild src/fsharp-compiler-unittests-build.proj /p:Configuration=Release
77-
msbuild src/fsharp-library-build.proj /p:TargetFramework=net20 /p:Configuration=Release
78-
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
79-
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
80-
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
81-
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
82-
msbuild src/fsharp-library-unittests-build.proj /p:Configuration=Release
83-
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
84-
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
85-
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
86-
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
87-
src\update.cmd release -ngen
88-
tests\BuildTestTools.cmd release
89-
```
74+
msbuild src/fsharp-library-build.proj /p:Configuration=Release
75+
msbuild src/fsharp-compiler-build.proj /p:Configuration=Release
76+
msbuild src/fsharp-typeproviders-build.proj /p:Configuration=Release
77+
msbuild src/fsharp-compiler-unittests-build.proj /p:Configuration=Release
78+
msbuild src/fsharp-library-build.proj /p:TargetFramework=net20 /p:Configuration=Release
79+
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
80+
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
81+
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
82+
msbuild src/fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
83+
msbuild src/fsharp-library-unittests-build.proj /p:Configuration=Release
84+
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
85+
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
86+
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
87+
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
88+
src\update.cmd release -ngen
89+
tests\BuildTestTools.cmd release
90+
9091

9192
[Optional] If testing the Visual F# IDE Tools (see below) you will also need:
9293

93-
```
94-
msbuild vsintegration\fsharp-vsintegration-build.proj /p:Configuration=Release
95-
msbuild vsintegration\fsharp-vsintegration-unittests-build.proj /p:Configuration=Release
96-
```
94+
msbuild vsintegration\fsharp-vsintegration-build.proj /p:Configuration=Release
95+
msbuild vsintegration\fsharp-vsintegration-unittests-build.proj /p:Configuration=Release
96+
97+
##4.[Optional] Install the Visual F# IDE Tools and Clobber the F# 4.0 SDK on the machine
98+
99+
NOTE: Step#2 will install a VSIX extension into Visual Studio 2015 that changes the Visual F# IDE Tools
100+
components installed into Visual Studio 2015. You can revert this step by disabling or uninstalling the addin.
101+
102+
NOTE: Step#3 will clobber the machine-wide installed F# 4.0 SDK on your machine. This replaces the``fsi.exe``/``fsiAnyCpu.exe`` used
103+
by Visual F# Interactive and the fsc.exe used by Microsoft.FSharp.targets. Repairing Visual Studio 2015 is currently the
104+
only way to revert this step.
105+
106+
NOTE: After you complete the install, the FSharp.Core referenced by your projects will not be updated. If you want to make
107+
a project that references your updated FSharp.Core, you must explicitly change the``TargetFSharpCoreVersion`` in the .fsproj
108+
file to``4.4.0.5099`` (or a corresponding portable version number with suffix``5099``).
109+
110+
For debug:
97111

98-
##4.[Optional] Build and Install the Visual F# IDE Tools
112+
1. Ensure that the VSIX package is uninstalled. In VS, select Tools/Extensions and Updates and if the package`VisualStudio.FSharp.EnableOpenSource` is installed, select Uninstall
113+
1. Run``debug\net40\bin\EnableOpenSource.vsix``
114+
1. Run``vsintegration\update-vsintegration.cmd debug`` (clobbers the installed F# 4.0 SDK)
99115

100-
To build the VS components:
116+
For release:
101117

102-
```
103-
msbuild vsintegration\fsharp-vsintegration-build.proj
104-
```
118+
1. Ensure that the VSIX package is uninstalled. In VS, select Tools/Extensions and Updates and if the package`VisualStudio.FSharp.EnableOpenSource` is installed, select Uninstall
119+
1. Run``release\net40\bin\EnableOpenSource.vsix``
120+
1. Run``vsintegration\update-vsintegration.cmd release`` (clobbers the installed F# 4.0 SDK)
105121

106-
To install the VS components:
122+
Restart Visual Studio, it should now be running your freshly-built Visual F# IDE Tools with updated F# Interactive.
107123

108-
1. Ensure that the VSIX package is uninstalled.
109-
- In VS, select Tools/Extensions and Updates
110-
- If the package`VisualStudio.FSharp.EnableOpenSource` is installed, select Uninstall
111-
1. Run```debug\net40\bin\EnableOpenSource.vsix```
112-
1. Restart Visual Studio, it should now be running your freshly-built Visual F# IDE Tools.
113124

114125
###Notes on the build
115126

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[![Issue Stats](http://issuestats.com/github/Microsoft/visualfsharp/badge/pr)](http://issuestats.com/github/microsoft/visualfsharp)
22
[![Issue Stats](http://issuestats.com/github/Microsoft/visualfsharp/badge/issue)](http://issuestats.com/github/microsoft/visualfsharp)
3+
[![Build status](https://img.shields.io/appveyor/ci/KevinRansom/visualfsharp-radou/fsharp4.svg)](https://ci.appveyor.com/project/KevinRansom/visualfsharp-radou/branch/fsharp4)
34

45
#Visual F# Tools
56

@@ -39,4 +40,4 @@ Although the primary focus of this repo is F# for Windows and the Visual Studio
3940

4041
###Get In Touch
4142

42-
Keep up with the Visual F# Team and the development of the Visual F# Tools by following us[@VisualFSharp](https://twitter.com/VisualFSharp) or subscribing to our[team blog](http://blogs.msdn.com/b/fsharpteam/).
43+
Keep up with the Visual F# Team and the development of the Visual F# Tools by following us[@VisualFSharp](https://twitter.com/VisualFSharp) or subscribing to our[team blog](http://blogs.msdn.com/b/fsharpteam/).

‎TESTGUIDE.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ The test cases for this suite reside next to the Visual F# Tools code, at `vsint
2222
In order to run all of the tests, you will need to install
2323

2424
*[Perl](http://www.perl.org/get.html) (ActiveState Perl 5.16.3 is known to work fine)
25-
*[NUnit](http://nunit.org/?p=download) (2.6.3 is known to work fine)
2625

27-
Perland NUnitmust 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 modify the GAC, and this requires administrative privileges.
26+
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 modify the GAC, and this requires administrative privileges.
2827

2928
Before running tests, make sure you have successfully built all required projects as specified in the 'Prepare For Tests' section of the[DEVGUIDE](DEVGUIDE.md).
3029

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp