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

Commit8381e23

Browse files
committed
merge
2 parentsaf471a3 +6c6de72 commit8381e23

File tree

1,676 files changed

+56319
-54251
lines changed

Some content is hidden

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

1,676 files changed

+56319
-54251
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ obj
102102
extras
103103
ossreadme*.txt
104104
*.csproj.user
105+
*.fsproj.user
105106
*.sln.DotSettings.user
106107
*.ide
107108
*.log

‎CHANGELOG.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>

‎CODE_OF_CONDUCT.md‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#Contributor Covenant Code of Conduct
2+
3+
##Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6+
7+
##Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
##Our Responsibilities
26+
27+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
28+
29+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
30+
31+
##Scope
32+
33+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
34+
35+
##Enforcement
36+
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team atopensource@microsoft.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
38+
39+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
40+
41+
##Attribution
42+
43+
This Code of Conduct is adapted from the[Contributor Covenant][homepage], version 1.4, available at[http://contributor-covenant.org/version/1/4][version]
44+
45+
[homepage]:http://contributor-covenant.org
46+
[version]:http://contributor-covenant.org/version/1/4/

‎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.txt‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
1-
Copyright (c) Microsoft Corporation. All rights reserved.
1+
The MIT License (MIT)
22

3-
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
4-
these files except in compliance with the License. You may obtain a copy of the
5-
License at
3+
Copyright (c) Microsoft Corporation.
4+
All rights reserved.
65

7-
http://www.apache.org/licenses/LICENSE-2.0
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.
823

9-
Unless required by applicable law or agreed to in writing, software distributed
10-
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
11-
CONDITIONS OF ANY KIND, either express or implied. See the License for the
12-
specific language governing permissions and limitations under the License.

‎README.md‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#The F# Language, Library Repository (also Visual F# Tools Repository)
1+
#The F# Language, Library, and Visual F# Tools Repository
22

33
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

@@ -21,6 +21,12 @@ For historical reasons this repository is called "visualfsharp" and currently al
2121
|**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/)|
2222
|**vs2017-rtm** |[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ubuntu14.04)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ubuntu14.04/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/debug_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/debug_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ci_part1_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ci_part1_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ci_part2_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ci_part2_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ci_part3_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ci_part3_windows_nt/)|
2323

24+
25+
##Help improve the Quality of the Tools by Using the Nightly Releases of Visual F# Tools
26+
To setup Visual Studio to use the latest nightly releases of the Visual F# Tools:
27+
https://blogs.msdn.microsoft.com/dotnet/2017/03/14/announcing-nightly-releases-for-the-visual-f-tools/
28+
29+
2430
##Contributing
2531

2632
See[DEVGUIDE.md](DEVGUIDE.md) and[TESTGUIDE.md](TESTGUIDE.md) for details on build, development, and testing.
@@ -42,7 +48,7 @@ To contribute to the F# ecosystem more generally see the F# Software Foundation'
4248

4349
###License
4450

45-
This project is subject to theApache Licence, Version 2.0. A copy ofthe license can be found in[License.txt](License.txt) at the root of this repo.
51+
This project is subject to theMIT License. A copy ofthis license can be found in[License.txt](License.txt) at the root of this repo.
4652

4753

4854
##Using
@@ -51,7 +57,9 @@ For typical installs of F#, see http://fsharp.org.
5157

5258
###Using Nightly Releases of Visual F# Tools
5359

54-
To setup Visual Studio to use the latest nightly releases of the Visual F# Tools, follow the[Using CI Builds](https://github.com/Microsoft/visualfsharp/wiki/Using-CI-Builds) instructions.
60+
To setup Visual Studio to use the latest nightly releases of the Visual F# Tools:
61+
62+
https://blogs.msdn.microsoft.com/dotnet/2017/03/14/announcing-nightly-releases-for-the-visual-f-tools/
5563

5664
###Using CI Builds
5765

‎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

‎before_install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fi)
5858
fi)
5959

6060
#TODO: work out how to avoid the need for this
61-
chmod u+x packages/FSharp.Compiler.Tools.4.1.5/tools/fsi.exe
61+
chmod u+x packages/FSharp.Compiler.Tools.4.1.23/tools/fsi.exe
6262
chmod u+x packages/FsLexYacc.7.0.6/build/fslex.exe
6363
chmod u+x packages/FsLexYacc.7.0.6/build/fsyacc.exe
6464

‎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'">

‎build.cmd‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
rem 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+
rem Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
22
@if"%_echo%"==""echooff
33

44
setlocalenableDelayedExpansion
@@ -554,7 +554,7 @@ set _dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
554554
setNUGET_PACKAGES=%~dp0Packages
555555
setpath=%~dp0Tools\dotnet20\;%path%
556556

557-
set_fsiexe="packages\FSharp.Compiler.Tools.4.1.5\tools\fsi.exe"
557+
set_fsiexe="packages\FSharp.Compiler.Tools.4.1.23\tools\fsi.exe"
558558
ifnotexist%_fsiexe%echo Error: Could not find%_fsiexe%&&goto :failure
559559
%_ngenexe% install%_fsiexe% /nologo
560560

@@ -592,8 +592,8 @@ if "%BUILD_PROTO%" == "1" (
592592

593593
if"%BUILD_PROTO_WITH_CORECLR_LKG%"=="0" (
594594

595-
echo%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.5\tools\fsc.exe /nologo
596-
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.5\tools\fsc.exe /nologo
595+
echo%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.23\tools\fsc.exe /nologo
596+
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.23\tools\fsc.exe /nologo
597597

598598
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
599599
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
@@ -614,10 +614,11 @@ if "%BUILD_PHASE%" == "1" (
614614
@if ERRORLEVEL1echo Error build failed&&goto :failure
615615
)
616616

617-
echo ---------------- Done with build, starting update/prepare ---------------
617+
echo ---------------- Done with build, startingpack/update/prepare ---------------
618618

619619
if"%BUILD_NET40_FSHARP_CORE%"=="1" (
620-
call src\update.cmd%BUILD_CONFIG% -ngen
620+
echo ---------------- start update.cmd ---------------
621+
call src\update.cmd%BUILD_CONFIG% -ngen
621622
)
622623

623624
@echo set NUNITPATH=packages\NUnit.Console.3.0.0\tools\

0 commit comments

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