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

Commitdd159c5

Browse files
committed
Merge branch 'vs2017-rtm'
2 parents43c90f8 +32e0a49 commitdd159c5

File tree

242 files changed

+4060
-3713
lines changed

Some content is hidden

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

242 files changed

+4060
-3713
lines changed

‎DEVGUIDE.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Note: if you face this error [#2351](https://github.com/Microsoft/visualfsharp/i
111111
112112
Or hard crash on launch ("Unknown Error"), delete these folders:
113113

114-
*`%localappdata%\Microsoft\VisualStudio\15.0_(some number here)FSharpDev`
114+
*`%localappdata%\Microsoft\VisualStudio\15.0_(some number here)RoslynDev`
115115
*`%localappdata%\Microsoft\VisualStudio\15.0_(some number here)`
116116

117117
####[Optional] Install the Visual F# IDE Tools (Windows Only)
@@ -138,9 +138,14 @@ Restart Visual Studio, it should now be running your freshly-built Visual F# IDE
138138

139139
####[Optional] F5 testing of local changes
140140

141-
To test your changes locally_without_ overwriting your default installed F# tools, set the`VisualFSharp\Vsix\VisualFSharpOpenSource`
142-
project as the startup project. When you hit F5 a new instance of Visual Studio will be started in the`FSharpDev` hive with your
143-
changes, but the root (default) hive will remain untouched.
141+
To test your changes locally_without_ overwriting your default installed Visual F# tools, set the`VisualFSharp\Vsix\VisualFSharpOpenSource`
142+
project as the startup project. When you hit F5 a new instance of Visual Studio will be started in the`RoslynDev` hive with your
143+
changes, but the root (default) hive will remain untouched. You can also start this hive automatically using
144+
145+
devenv.exe /rootsuffix:RoslynDev
146+
147+
Because this uses the "RoslynDev" hive you can simultaneously test changes to an appropriate build of Roslyn binaries.
148+
144149

145150
####[Optional] Rapid deployment of incremental changes to Visual F# IDE Tools components
146151

‎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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ F# is a mature, open source, cross-platform, functional-first programming langua
1212
|| Ubuntu (Build)| Windows (Debug Build)| Windows (Release Tests 1)| Windows (Release Tests 2)| Windows (Release Tests 3)| Windows (Release Tests 4)|
1313
|:----------:|:----------------:|:----------------:|:------------------:|:-----------------------:|:---------------------:|:----------:|
1414
|**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/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part4_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part4_windows_nt/)|
15+
|**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/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ci_part4_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ci_part4_windows_nt/)|
1516

1617
##Contributing
1718

0 commit comments

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