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

Commitcf4cd7f

Browse files
authored
Merge pull request #3090 from Microsoft/master
merge master into vs2017-rtm
2 parents3e31902 +2389a27 commitcf4cd7f

File tree

86 files changed

+902
-733
lines changed

Some content is hidden

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

86 files changed

+902
-733
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

‎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

‎build.cmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,8 +527,8 @@ if defined TF_BUILD (
527527
git fetch --all
528528
)
529529

530-
REMset msbuildflags=/maxcpucount %_nrswitch% /nologo
531-
setmsbuildflags=%_nrswitch% /nologo
530+
setmsbuildflags=/maxcpucount%_nrswitch% /nologo
531+
REMset msbuildflags=%_nrswitch% /nologo
532532
set_ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
533533
ifnotexist%_ngenexe%echo Error: Could not find ngen.exe.&&goto :failure
534534

‎src/fsharp/AugmentWithHashCompare.fs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
/// Generate the hash/compare functions we add to user-defined types by default.
44
moduleinternalMicrosoft.FSharp.Compiler.AugmentWithHashCompare
55

6-
openInternal.Utilities
76
openMicrosoft.FSharp.Compiler
87
openMicrosoft.FSharp.Compiler.AbstractIL
98
openMicrosoft.FSharp.Compiler.AbstractIL.IL
@@ -13,8 +12,6 @@ open Microsoft.FSharp.Compiler.Tast
1312
openMicrosoft.FSharp.Compiler.Tastops
1413
openMicrosoft.FSharp.Compiler.Ast
1514
openMicrosoft.FSharp.Compiler.ErrorLogger
16-
openMicrosoft.FSharp.Compiler.PrettyNaming
17-
openMicrosoft.FSharp.Compiler.Lib
1815
openMicrosoft.FSharp.Compiler.TcGlobals
1916
openMicrosoft.FSharp.Compiler.Infos
2017

‎src/fsharp/CheckFormatStrings.fs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ module internal Microsoft.FSharp.Compiler.CheckFormatStrings
44

55
openInternal.Utilities
66
openMicrosoft.FSharp.Compiler
7-
openMicrosoft.FSharp.Compiler.AbstractIL
8-
openMicrosoft.FSharp.Compiler.AbstractIL.Internal
97
openMicrosoft.FSharp.Compiler.AbstractIL.Internal.Library
108
openMicrosoft.FSharp.Compiler.Ast
119
openMicrosoft.FSharp.Compiler.Range
12-
openMicrosoft.FSharp.Compiler.ErrorLogger
1310
openMicrosoft.FSharp.Compiler.Tast
1411
openMicrosoft.FSharp.Compiler.Tastops
1512
openMicrosoft.FSharp.Compiler.TcGlobals

‎src/fsharp/ConstraintSolver.fs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@ module internal Microsoft.FSharp.Compiler.ConstraintSolver
3030
//
3131
//-------------------------------------------------------------------------
3232

33-
openInternal.Utilities
3433
openInternal.Utilities.Collections
3534

3635
openMicrosoft.FSharp.Compiler
3736
openMicrosoft.FSharp.Compiler.AbstractIL
38-
openMicrosoft.FSharp.Compiler.AbstractIL.Diagnostics
3937
openMicrosoft.FSharp.Compiler.AbstractIL.Internal
4038
openMicrosoft.FSharp.Compiler.AbstractIL.Internal.Library
4139
openMicrosoft.FSharp.Compiler.Ast
@@ -51,7 +49,6 @@ open Microsoft.FSharp.Compiler.Rational
5149
openMicrosoft.FSharp.Compiler.InfoReader
5250
openMicrosoft.FSharp.Compiler.Tast
5351
openMicrosoft.FSharp.Compiler.Tastops
54-
openMicrosoft.FSharp.Compiler.Tastops.DebugPrint
5552
openMicrosoft.FSharp.Compiler.TcGlobals
5653
openMicrosoft.FSharp.Compiler.TypeRelations
5754

‎src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@
646646
<Private>True</Private>
647647
</Reference>
648648
<ReferenceInclude="Microsoft.VisualStudio.Threading">
649-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
649+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.15.3.20\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
650650
</Reference>
651651
<ReferenceInclude="Microsoft.VisualStudio.Shell.Design, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
652652
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Design.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Design.dll</HintPath>

‎src/fsharp/FindUnsolved.fs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,12 @@ module internal Microsoft.FSharp.Compiler.FindUnsolved
99
openInternal.Utilities
1010

1111
openMicrosoft.FSharp.Compiler
12-
openMicrosoft.FSharp.Compiler.AbstractIL
13-
openMicrosoft.FSharp.Compiler.AbstractIL.IL
1412
openMicrosoft.FSharp.Compiler.AbstractIL.Internal
1513
openMicrosoft.FSharp.Compiler.AbstractIL.Internal.Library
16-
openMicrosoft.FSharp.Compiler.AbstractIL.Diagnostics
17-
openMicrosoft.FSharp.Compiler.Range
18-
openMicrosoft.FSharp.Compiler.Ast
19-
openMicrosoft.FSharp.Compiler.ErrorLogger
2014
openMicrosoft.FSharp.Compiler.Tast
2115
openMicrosoft.FSharp.Compiler.Tastops
2216
openMicrosoft.FSharp.Compiler.TcGlobals
23-
openMicrosoft.FSharp.Compiler.Lib
24-
openMicrosoft.FSharp.Compiler.Layout
25-
openMicrosoft.FSharp.Compiler.AbstractIL.IL
2617
openMicrosoft.FSharp.Compiler.TypeRelations
27-
openMicrosoft.FSharp.Compiler.Infos
2818

2919
typeenv= Nix
3020

‎src/fsharp/InfoReader.fs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
/// Select members from a type by name, searching the type hierarchy if needed
55
moduleinternalMicrosoft.FSharp.Compiler.InfoReader
66

7-
openInternal.Utilities
8-
9-
openMicrosoft.FSharp.Compiler.AbstractIL
10-
openMicrosoft.FSharp.Compiler.AbstractIL.Diagnostics
117
openMicrosoft.FSharp.Compiler.AbstractIL.IL
128
openMicrosoft.FSharp.Compiler.AbstractIL.Internal
139
openMicrosoft.FSharp.Compiler.AbstractIL.Internal.Library

‎src/fsharp/MethodOverrides.fs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,19 @@
33
/// Primary logic related to method overrides.
44
moduleinternalMicrosoft.FSharp.Compiler.MethodOverrides
55

6-
openInternal.Utilities
7-
openSystem.Text
8-
96
openMicrosoft.FSharp.Compiler
10-
openMicrosoft.FSharp.Compiler.AbstractIL
11-
openMicrosoft.FSharp.Compiler.AbstractIL.IL
127
openMicrosoft.FSharp.Compiler.AbstractIL.Internal
138
openMicrosoft.FSharp.Compiler.AbstractIL.Internal.Library
14-
openMicrosoft.FSharp.Compiler.AbstractIL.Diagnostics
159
openMicrosoft.FSharp.Compiler.Ast
1610
openMicrosoft.FSharp.Compiler.ErrorLogger
1711
openMicrosoft.FSharp.Compiler.Lib
1812
openMicrosoft.FSharp.Compiler.Infos
1913
openMicrosoft.FSharp.Compiler.AccessibilityLogic
2014
openMicrosoft.FSharp.Compiler.NameResolution
21-
openMicrosoft.FSharp.Compiler.PrettyNaming
2215
openMicrosoft.FSharp.Compiler.Range
2316
openMicrosoft.FSharp.Compiler.InfoReader
2417
openMicrosoft.FSharp.Compiler.Tast
2518
openMicrosoft.FSharp.Compiler.Tastops
26-
openMicrosoft.FSharp.Compiler.Tastops.DebugPrint
2719
openMicrosoft.FSharp.Compiler.TcGlobals
2820
openMicrosoft.FSharp.Compiler.TypeRelations
2921

0 commit comments

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