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

Commit98b0b18

Browse files
committed
integrate visualfsharp master
2 parentsa093a89 +9893e72 commit98b0b18

File tree

483 files changed

+17624
-17938
lines changed

Some content is hidden

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

483 files changed

+17624
-17938
lines changed

‎.gitignore‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@
77
# (These aren't generally useful to commit directly; if anything, they should be applied.)
88
scripts/*.patch
99

10+
/fcs/FSharp.Compiler.Service/illex.fs
11+
/fcs/FSharp.Compiler.Service/ilpars.fs
12+
/fcs/FSharp.Compiler.Service/ilpars.fsi
13+
/fcs/FSharp.Compiler.Service/lex.fs
14+
/fcs/FSharp.Compiler.Service/pars.fs
15+
/fcs/FSharp.Compiler.Service/pars.fsi
16+
/fcs/FSharp.Compiler.Service/pplex.fs
17+
/fcs/FSharp.Compiler.Service/pppars.fs
18+
/fcs/FSharp.Compiler.Service/pppars.fsi
1019
/src/*.userprefs
1120
/src/fsharp/FSStrings.resources
1221
/src/fsharp/FSharp.Build/*.resx
@@ -26,15 +35,6 @@ scripts/*.patch
2635
/src/fsharp/FSharp.Compiler.Private/*.sln
2736
/src/fsharp/FSharp.Compiler.Private/*.userprefs
2837
/src/*.log
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
3838
/src/fsharp/Fsc-proto/illex.fs
3939
/src/fsharp/Fsc-proto/ilpars.fs
4040
/src/fsharp/Fsc-proto/ilpars.fsi
@@ -199,6 +199,7 @@ FSharp.Core.Nuget/*.nupkg
199199
tests/fsharpqa/Source/*FSharpQA_Failures.env
200200
tests/fsharpqa/Source/*FSharpQA_Failures.lst
201201
*.csproj.user
202+
*.fsproj.user
202203
*.sln.DotSettings.user
203204
*.ide
204205
*.log

‎CHANGELOG-visualfsharp.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
Copyright (c) Microsoft Corporation. All Rights Reserved.
33

4-
Licensed under the Apache License, Version 2.0.
54
See License.txt in the project root for license information.
65

76
Visual F<span>#</span>

‎DotnetCLIToolsVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0-preview2-006494
1+
2.0.0-preview2-006502

‎FSharp.sln‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -205,18 +205,6 @@ Global
205205
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|Any CPU.Build.0=Release|Any CPU
206206
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.ActiveCfg=Release|Any CPU
207207
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.Build.0=Release|Any CPU
208-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
209-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|Any CPU.Build.0=Debug|Any CPU
210-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|x86.ActiveCfg=Debug|Any CPU
211-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|x86.Build.0=Debug|Any CPU
212-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
213-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|Any CPU.Build.0=Proto|Any CPU
214-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|x86.ActiveCfg=Proto|Any CPU
215-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|x86.Build.0=Proto|Any CPU
216-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|Any CPU.ActiveCfg=Release|Any CPU
217-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|Any CPU.Build.0=Release|Any CPU
218-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|x86.ActiveCfg=Release|Any CPU
219-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|x86.Build.0=Release|Any CPU
220208
EndGlobalSection
221209
GlobalSection(SolutionProperties) =preSolution
222210
HideSolutionNode =FALSE
@@ -235,6 +223,5 @@ Global
235223
{88E2D422-6852-46E3-A740-83E391DC7973} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
236224
{4239EFEA-E746-446A-BF7A-51FCBAB13946} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
237225
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
238-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152} ={3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
239226
EndGlobalSection
240227
EndGlobal

‎ISSUE_TEMPLATE.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ Provide the steps required to reproduce the problem
1010

1111
2. Step B
1212

13+
If possible attach a zip file with the repro case. This often makes it easier for others to reproduce.
14+
The zip file should ideally represent the situation just before the call/step that is problematic.
15+
1316
####Expected behavior
1417

1518
Provide a description of the expected behaviour.
@@ -33,5 +36,3 @@ Provide any related information
3336
* Links to F# RFCs or entries onhttps://github.com/fsharp/fslang-suggestions
3437
* Links to performance testing scripts
3538
* Indications of severity
36-
37-

‎LICENSE‎

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

‎License.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) Microsoft Corporation.
4+
All rights reserved.
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.
23+

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,16 @@ available from this repo.
4343

4444
The`master` branch is for F# 4.x. To bootstrap the compiler, binaries built from an earlier version of this project are used. This codebase uses the Apache 2.0 license.
4545

46+
<<<<<<< HEAD
4647
| F#| Branch| macOS/Linux| Windows|
4748
|------|---------------|-----------|---------|
4849
| 4.1+|``master``|[![Build Status](https://travis-ci.org/fsharp/fsharp.png?branch=master)](https://travis-ci.org/fsharp/fsharp/branches)|[![Build status](https://ci.appveyor.com/api/projects/status/7m5e2yr0snbbr7t9)](https://ci.appveyor.com/project/fsgit/fsharp)|
4950
| 4.0|``fsharp4``|[![Build Status](https://travis-ci.org/fsharp/fsharp.png?branch=fsharp4)](https://travis-ci.org/fsharp/fsharp/branches)|
51+
=======
52+
To setup Visual Studio to use the latest nightly releases of the Visual F# Tools:
53+
54+
https://blogs.msdn.microsoft.com/dotnet/2017/03/14/announcing-nightly-releases-for-the-visual-f-tools/
55+
>>>>>>>9893e723694ce1ac054c8f10e3abb5436de389cd
5056
5157

5258
##Details on the various Alternative Packagings

‎attributions.md‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ This is for those who contributed language features, compiler improvements, or i
3737

3838
-[Gustavo Leon](https://github.com/gmpl)
3939

40+
41+
###F# 4.2 Compiler Improvements
42+
43+
- Deterministic compilation via`--deterministic`, by[David Glassborow](https://github.com/davidglassborow)
44+
4045
###FSharp.Core
4146

4247
**Performance Improvements**
@@ -53,9 +58,9 @@ This is for those who contributed language features, compiler improvements, or i
5358

5459
-[Eirik Tsarpalis](https://github.com/eiriktsarpalis)
5560

56-
###F# 4.2 CompilerImprovements
61+
**GeneralImprovements**
5762

58-
-Deterministic compilation via`--deterministic`, by[David Glassborow](https://github.com/davidglassborow)
63+
-[Jérémie Chassaing](https://github.com/thinkbeforecoding)
5964

6065
##Tooling - Visual Studio and Platform Support
6166

@@ -66,7 +71,7 @@ This is for those who contributed Visual Studio IDE features and platform suppor
6671
**Editor Features**
6772

6873
* Semantic Colorization -[Vasily Kirichenko](https://github.com/vasily-kirichenko) and[Saul Rennison](https://github.com/saul)
69-
* Autocompletion -[Vasily Kirichenko](https://github.com/vasily-kirichenko)
74+
* Autocompletion -[Vasily Kirichenko](https://github.com/vasily-kirichenko) and[Saul Rennison](https://github.com/saul)
7075
* IntelliSense Filters and Glyph improvements -[Vasily Kirichenko](https://github.com/vasily-kirichenko)
7176
* IntelliSense accuracy Improvements -[Vasily Kirichenko](https://github.com/vasily-kirichenko)
7277
* Go To All -[Vasily Kirichenko](https://github.com/vasily-kirichenko) and[Jared Hester](github.com/cloudroutine)
@@ -94,13 +99,19 @@ This is for those who contributed Visual Studio IDE features and platform suppor
9499
* Support for Editor Settings -[Jakub Majocha](https://github.com/majocha)
95100
* Localized Go to Definition Status Bar -[Saul Rennison](https://github.com/saul)
96101
* R#-like completion for items in unopened namespaces -[Vasily Kirichenko](https://github.com/vasily-kirichenko)
97-
* Wrap XML docs -[Jakub Majocha](https://github.com/majocha)
102+
* Wrapped XML docs in QuickInfo -[Jakub Majocha](https://github.com/majocha)
103+
* Smart indent and de-indent -[Duc Nghiem Xuan](https://github.com/xuanduc987) and[Saul Rennison](https://github.com/saul)
104+
* F# to C# navigation -[Saul Rennison](https://github.com/saul) and[Vasily Kirichenko](https://github.com/vasily-kirichenko)
105+
* Support for Blue Theme (High Contrast) in semantic colorization -[Vasily Kirichenko](https://github.com/vasily-kirichenko)
106+
* Configuration-driven in-memory cross-project references and project cache size -[Vasily Kirichenko](https://github.com/vasily-kirichenko)
107+
98108

99109
**Project System**
100110

101111
* Improved solution load time -[Saul Rennison](https://github.com/saul)
102112
* General improvements -[Jakub Majocha](https://github.com/majocha)
103113
* Move Up/Move Down on Solution folder nodes -[Saul Rennison](https://github.com/saul)
114+
* Folder support -[Saul Rennison](https://github.com/saul)
104115

105116
**F# Interactive**
106117

‎build-everything.proj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved.Licensed under the Apache License, Version 2.0.See License.txt in the project root for license information.-->
1+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
22
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003"ToolsVersion="4.0">
33

44
<!-- +++++++++++++++++++++++ Project selection for building +++++++++++++++++++++++++++++++-->
@@ -37,6 +37,10 @@
3737

3838
<ItemGroupCondition="'$(BUILD_FCS)'=='1'">
3939
<ProjectsWithNet40Include="fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj" />
40+
<ProjectsWithNet40Include="fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj" />
41+
<ProjectsWithNet40Include="fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj" />
42+
<ProjectsWithNet40Include="fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj" />
43+
<ProjectsWithNet40Include="fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" />
4044
</ItemGroup>
4145

4246
<ItemGroupCondition="'$(BUILD_SETUP)'=='1'">

0 commit comments

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