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

Commitc9a64b2

Browse files
Merge branch 'master' into nameof-operator
2 parents1ad0a0e +a16cdc2 commitc9a64b2

File tree

42 files changed

+2982
-352
lines changed

Some content is hidden

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

42 files changed

+2982
-352
lines changed

‎VisualFSharp.sln‎

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion =15.0.26014.0
4+
VisualStudioVersion =15.0.26020.0
55
MinimumVisualStudioVersion =10.0.40219.1
66
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler","src\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
77
EndProject
@@ -137,6 +137,10 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "HostedCompilerServer", "tes
137137
EndProject
138138
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="ILComparer","tests\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj","{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}"
139139
EndProject
140+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Utils","Utils","{D086C8C6-D00D-4C3B-9AB2-A4286C9F5922}"
141+
EndProject
142+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="LanguageServiceProfiling","vsintegration\Utils\LanguageServiceProfiling\LanguageServiceProfiling.fsproj","{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}"
143+
EndProject
140144
Global
141145
GlobalSection(SolutionConfigurationPlatforms) =preSolution
142146
Debug|Any CPU=Debug|Any CPU
@@ -738,6 +742,18 @@ Global
738742
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|Any CPU.Build.0=Release|Any CPU
739743
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.ActiveCfg=Release|Any CPU
740744
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.Build.0=Release|Any CPU
745+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
746+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Debug|Any CPU.Build.0=Debug|Any CPU
747+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Debug|x86.ActiveCfg=Debug|Any CPU
748+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Debug|x86.Build.0=Debug|Any CPU
749+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|Any CPU.ActiveCfg=Release|Any CPU
750+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|Any CPU.Build.0=Release|Any CPU
751+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|x86.ActiveCfg=Release|Any CPU
752+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|x86.Build.0=Release|Any CPU
753+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Release|Any CPU.ActiveCfg=Release|Any CPU
754+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Release|Any CPU.Build.0=Release|Any CPU
755+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Release|x86.ActiveCfg=Release|Any CPU
756+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Release|x86.Build.0=Release|Any CPU
741757
EndGlobalSection
742758
GlobalSection(SolutionProperties) =preSolution
743759
HideSolutionNode =FALSE
@@ -798,5 +814,7 @@ Global
798814
{E6A45CDF-B408-420F-B475-74611BEFC52B} ={141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
799815
{4239EFEA-E746-446A-BF7A-51FCBAB13946} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
800816
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
817+
{D086C8C6-D00D-4C3B-9AB2-A4286C9F5922} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
818+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903} ={D086C8C6-D00D-4C3B-9AB2-A4286C9F5922}
801819
EndGlobalSection
802820
EndGlobal

‎build.cmd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ if /i '%ARG%' == 'test-net40-fsharp' (
319319

320320
if /i '%ARG%'== 'test-coreclr-fsharp' (
321321
setBUILD_NET40=1
322+
setBUILD_PROTO_WITH_CORECLR_LKG=1
322323
setBUILD_CORECLR=1
323324
setTEST_CORECLR_FSHARP_SUITE=1
324325
)

0 commit comments

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