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

Commit4a312d3

Browse files
committed
Merge remote-tracking branch 'upstream/master' into vs2017-rtm
2 parents7768abe +c6a070b commit4a312d3

File tree

398 files changed

+5047
-19232
lines changed

Some content is hidden

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

398 files changed

+5047
-19232
lines changed

‎.gitignore‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,29 @@ scripts/*.patch
2121
/src/fsharp/FSharp.Compiler.Server.Shared/*.resx
2222
/src/fsharp/fsi/Fsi.sln
2323
/src/fsharp/FSharp.Build/*.resources
24-
/src/fsharp/FSharp.Compiler/*.resx
25-
/src/fsharp/FSharp.Compiler/*.resources
26-
/src/fsharp/FSharp.Compiler/*.sln
27-
/src/fsharp/FSharp.Compiler/*.userprefs
24+
/src/fsharp/FSharp.Compiler.Private/*.resx
25+
/src/fsharp/FSharp.Compiler.Private/*.resources
26+
/src/fsharp/FSharp.Compiler.Private/*.sln
27+
/src/fsharp/FSharp.Compiler.Private/*.userprefs
2828
/src/*.log
29-
/src/fsharp/FSharp.Compiler/illex.fs
30-
/src/fsharp/FSharp.Compiler/ilpars.fs
31-
/src/fsharp/FSharp.Compiler/ilpars.fsi
32-
/src/fsharp/FSharp.Compiler/lex.fs
33-
/src/fsharp/FSharp.Compiler/pars.fs
34-
/src/fsharp/FSharp.Compiler/pars.fsi
35-
/src/fsharp/FSharp.Compiler/pplex.fs
36-
/src/fsharp/FSharp.Compiler/pppars.fs
37-
/src/fsharp/FSharp.Compiler/pppars.fsi
38-
/src/fsharp/FSharp.Compiler-proto/illex.fs
39-
/src/fsharp/FSharp.Compiler-proto/ilpars.fs
40-
/src/fsharp/FSharp.Compiler-proto/ilpars.fsi
41-
/src/fsharp/FSharp.Compiler-proto/lex.fs
42-
/src/fsharp/FSharp.Compiler-proto/pars.fs
43-
/src/fsharp/FSharp.Compiler-proto/pars.fsi
44-
/src/fsharp/FSharp.Compiler-proto/pplex.fs
45-
/src/fsharp/FSharp.Compiler-proto/pppars.fs
46-
/src/fsharp/FSharp.Compiler-proto/pppars.fsi
29+
/src/fsharp/FSharp.Compiler.Private/illex.fs
30+
/src/fsharp/FSharp.Compiler.Private/ilpars.fs
31+
/src/fsharp/FSharp.Compiler.Private/ilpars.fsi
32+
/src/fsharp/FSharp.Compiler.Private/lex.fs
33+
/src/fsharp/FSharp.Compiler.Private/pars.fs
34+
/src/fsharp/FSharp.Compiler.Private/pars.fsi
35+
/src/fsharp/FSharp.Compiler.Private/pplex.fs
36+
/src/fsharp/FSharp.Compiler.Private/pppars.fs
37+
/src/fsharp/FSharp.Compiler.Private/pppars.fsi
38+
/src/fsharp/Fsc-proto/illex.fs
39+
/src/fsharp/Fsc-proto/ilpars.fs
40+
/src/fsharp/Fsc-proto/ilpars.fsi
41+
/src/fsharp/Fsc-proto/lex.fs
42+
/src/fsharp/Fsc-proto/pars.fs
43+
/src/fsharp/Fsc-proto/pars.fsi
44+
/src/fsharp/Fsc-proto/pplex.fs
45+
/src/fsharp/Fsc-proto/pppars.fs
46+
/src/fsharp/Fsc-proto/pppars.fsi
4747
/src/fsharp/FSharp.LanguageService.Compiler/illex.*
4848
/src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
4949
/src/fsharp/FSharp.LanguageService.Compiler/lex.*
@@ -65,6 +65,8 @@ scripts/*.patch
6565
/tests/fsharpqa/Source/*net40-fsharpqa-suite-failures.env
6666
/tests/fsharpqa/Source/*net40-fsharpqa-suite-failures.lst
6767
/tests/**/FSharp.Core.dll
68+
/tests/fsharp/optimize/stats/FSharpOptimizationInfo.FSharp.Core
69+
/tests/fsharp/optimize/stats/FSharpSignatureInfo.FSharp.Core
6870
lib/debug
6971
lib/release
7072
lib/proto

‎.nuget/NuGet.Config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<packageSources>
88
<!--To inherit the global NuGet package sources remove the <clear/> line below-->
99
<clear />
10+
<addkey="artifacts"value="../artifacts" />
11+
<addkey="artifacts"value="../artifacts/4.2" />
1012
<addkey="myget.org fsharp-daily"value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
1113
<addkey="myget.org roslyn-master-nightly"value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
1214
<addkey="dotnet-core"value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
@@ -15,7 +17,6 @@
1517
<addkey="api.nuget.org"value="https://api.nuget.org/v3/index.json" />
1618
<addkey="myget.org roslyn tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1719
<addkey="myget.org roslyn"value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
18-
<addkey="artifacts"value="../artifacts" />
1920
</packageSources>
2021

2122
</configuration>

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ Includes commits up to `3385e58aabc91368c8e1f551650ba48705aaa285`
202202
* Allow breakpoints to be set inside of quotations
203203
* Support "Publish" action in project system for web, Azure
204204
* Bugfix[#126](https://visualfsharp.codeplex.com/workitem/126): F# package installer does not honor custom install paths for express SKUs
205-
* Bugfix[#75](https://visualfsharp.codeplex.com/workitem/75): Microsoft.FSharp.targets shim not deployed with F# SDK
205+
* Bugfix[#75](https://visualfsharp.codeplex.com/workitem/75): Microsoft.FSharp.Targets shim not deployed with F# SDK
206206
* Bugfix: Fix crash in smart indent provider
207207
* Bugfix[#55](https://visualfsharp.codeplex.com/workitem/55): Cannot add reference to F# PCL project
208208
* Bugfix: Typos in tutorial project script

‎DEVGUIDE.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ To build and test Visual F# IDE Tools, install these requirements:
9393
- Under the "Other Toolsets" workloads, select "Visual Studio extension development"
9494
- Under the "Individual components" tab select "Windows 10 SDK" as shown below (needed for compiling RC resource, see#2556):\
9595
![image](https://cloud.githubusercontent.com/assets/1249087/23730261/5c78c850-041b-11e7-9d9d-62766351fd0f.png)
96+
- Failing to install this will lead to error FS0193: Could not find file visualfsharp\vsintegration\src\FSharp.ProjectSystem.FSharp\obj\net40\ProjectResources.rc.res.
9697

9798
Steps to build:
9899

@@ -157,7 +158,7 @@ This gives a much tighter inner development loop than uninstalling/reinstalling
157158

158159
####[Optional] Clobber the F# SDK on the machine
159160

160-
**Note:** The step below will try to clobber the machine-wide installed F# SDK on your machine. This replaces the``fsc.exe`` used by the standardinnstall location or``Microsoft.FSharp.targets``.**Repairing Visual Studio 15 is currently the only way to revert this step.**
161+
**Note:** The step below will try to clobber the machine-wide installed F# SDK on your machine. This replaces the``fsc.exe`` used by the standardinstall location or``Microsoft.FSharp.Targets``.**Repairing Visual Studio 15 is currently the only way to revert this step.**
161162

162163
For**Debug**:
163164

‎DotnetCLIToolsVersion.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.0.0-preview2-006494

‎FSharp.sln‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion =15.0.26403.7
55
MinimumVisualStudioVersion =10.0.40219.1
6-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler","src\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
6+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Private","src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
77
EndProject
88
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Server.Shared","src\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj","{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}"
99
EndProject
@@ -43,8 +43,6 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "HostedCompilerServer", "tes
4343
EndProject
4444
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="ILComparer","tests\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj","{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}"
4545
EndProject
46-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.LanguageService.Compiler","src\fsharp\FSharp.LanguageService.Compiler\FSharp.LanguageService.Compiler.fsproj","{A437A6EC-5323-47C2-8F86-E2CAC54FF152}"
47-
EndProject
4846
Global
4947
GlobalSection(SolutionConfigurationPlatforms) =preSolution
5048
Debug|Any CPU=Debug|Any CPU

‎Makefile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@ all:
1515

1616
build-proto: restore
1717
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
18-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj
1918
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/Fsc-proto/Fsc-proto.fsproj
2019

2120
# The main targets
2221
build:
2322
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Core/FSharp.Core.fsproj
2423
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Build/FSharp.Build.fsproj
25-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj
24+
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
2625
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/Fsc/Fsc.fsproj
2726
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
2827
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
@@ -68,15 +67,15 @@ install:
6867
-rm -fr$(DESTDIR)$(monodir)/Microsoft\F#
6968
-rm -fr$(DESTDIR)$(monodir)/Microsoft\SDKs/F#
7069
-rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Core
71-
-rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Compiler
70+
-rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Compiler.Private
7271
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp
7372
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp
7473
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp
7574
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp
7675
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp
7776
$(MAKE) -C mono/FSharp.Core TargetFramework=net40 install
7877
$(MAKE) -C mono/FSharp.Build install
79-
$(MAKE) -C mono/FSharp.Compiler install
78+
$(MAKE) -C mono/FSharp.Compiler.Private install
8079
$(MAKE) -C mono/Fsc install
8180
$(MAKE) -C mono/FSharp.Compiler.Interactive.Settings install
8281
$(MAKE) -C mono/FSharp.Compiler.Server.Shared install

‎README.md‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
1-
#TheCombinedF# Language, Library, andTools Repository
1+
#The F# Language, Library Repository (also Visual F#Tools Repository)
22

3-
You are invited to help producing future releases of the F# language compiler, library, and tools.
3+
You are invited to help producing future releases of the F# language compiler, library, and tools. This repository enables development on Linux, macOS and Windows, along with some automated CI testing for these.
44

5+
*[About F#](http://fsharp.org)
6+
*[Testimonials](http://fsharp.org/testimonials)
57
*[Contributing](#contributing)
68
*[Using](#using)
79

8-
F# is a mature, open source, cross-platform, functional-first programming language which empowers users and organizations to tackle complex computing problems with simple, maintainable, and robust code. F# is used in a wide range of application areas and is supported by industry-leading companies providing professional tools, and by an active open community. You can find out more about F# athttp://fsharp.org.
10+
The F# Compiler and Tools are also mirrored in[the corresponding repository](http://github.com/fsharp/fsharp) of the F# Software Foundation.
11+
12+
Changes contributed here are eventually propagated to this repository and are included in all packagings of F# and open source F# editing tools. The process for doing this is explained in this guide by the[F# Core Engineering Group](https://fsharp.github.io/2014/06/18/fsharp-contributions.html). Currently, the F# community coordinates packaging[other editions of F#](https://github.com/fsharp/fsharp/) for use on Linux, macOS, Android, iOS, and other platforms, and Microsoft coordinates packaging this repository as part of the Visual F# Tools.
13+
14+
For historical reasons this repository is called "visualfsharp" and currently also contains the Visual F# IDE Tools. The eventual plan is to split these repositories into "fsharp" and "visualfsharp".
15+
916

1017
##Build Status
1118

@@ -38,12 +45,6 @@ To contribute to the F# ecosystem more generally see the F# Software Foundation'
3845
This project is subject to the Apache Licence, Version 2.0. A copy of the license can be found in[License.txt](License.txt) at the root of this repo.
3946

4047

41-
###Code Flow to Packagings of F#
42-
43-
This repository enables development on Linux, macOS and Windows. It enables automated CI testing for some of these.
44-
45-
Changes contributed here are eventually included in all packagings of F# and open source F# editing tools. Microsoft coordinates packaging this repository as part of the Visual F# Tools, and the F# community coordinates packaging[other editions of F#](https://github.com/fsharp/fsharp/) for use on Linux, macOS, Android, iOS, and other platforms.
46-
4748
##Using
4849

4950
For typical installs of F#, seehttp://fsharp.org.

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp