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

Commit4277b59

Browse files
authored
Merge pull request #3915 from Microsoft/merges/master-to-dev15.6-20171109-080047
Merge master to dev15.6
2 parents37408a9 +0b65191 commit4277b59

File tree

73 files changed

+356
-418
lines changed

Some content is hidden

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

73 files changed

+356
-418
lines changed

‎VisualFSharp.sln‎

Lines changed: 1 addition & 61 deletions
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.27005.2
4+
VisualStudioVersion =15.0.27102.0
55
MinimumVisualStudioVersion =10.0.40219.1
66
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
@@ -96,14 +96,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleProject", "vsintegra
9696
EndProject
9797
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="LibraryProject","vsintegration\ProjectTemplates\LibraryProject\LibraryProject.csproj","{01678CDA-A11F-4DEE-9344-2EDF91CF1AE7}"
9898
EndProject
99-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="NetCore78Project","vsintegration\ProjectTemplates\NetCore78Project\NetCore78Project.csproj","{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}"
100-
EndProject
101-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="NetCore259Project","vsintegration\ProjectTemplates\NetCore259Project\NetCore259Project.csproj","{D9D95330-3626-4199-B7AF-17B8E4AF6D87}"
102-
EndProject
103-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="NetCoreProject","vsintegration\ProjectTemplates\NetCoreProject\NetCoreProject.csproj","{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}"
104-
EndProject
105-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="PortableLibraryProject","vsintegration\ProjectTemplates\PortableLibraryProject\PortableLibraryProject.csproj","{DB374A0C-7560-479F-9B21-D37C81F7624F}"
106-
EndProject
10799
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="TutorialProject","vsintegration\ProjectTemplates\TutorialProject\TutorialProject.csproj","{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4}"
108100
EndProject
109101
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="ItemTemplates","ItemTemplates","{F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}"
@@ -564,54 +556,6 @@ Global
564556
{01678CDA-A11F-4DEE-9344-2EDF91CF1AE7}.Release|Any CPU.Build.0=Release|Any CPU
565557
{01678CDA-A11F-4DEE-9344-2EDF91CF1AE7}.Release|x86.ActiveCfg=Release|Any CPU
566558
{01678CDA-A11F-4DEE-9344-2EDF91CF1AE7}.Release|x86.Build.0=Release|Any CPU
567-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
568-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Debug|Any CPU.Build.0=Debug|Any CPU
569-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Debug|x86.ActiveCfg=Debug|Any CPU
570-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Debug|x86.Build.0=Debug|Any CPU
571-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
572-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Proto|Any CPU.Build.0=Proto|Any CPU
573-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Proto|x86.ActiveCfg=Proto|Any CPU
574-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Proto|x86.Build.0=Proto|Any CPU
575-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Release|Any CPU.ActiveCfg=Release|Any CPU
576-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Release|Any CPU.Build.0=Release|Any CPU
577-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Release|x86.ActiveCfg=Release|Any CPU
578-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Release|x86.Build.0=Release|Any CPU
579-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
580-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Debug|Any CPU.Build.0=Debug|Any CPU
581-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Debug|x86.ActiveCfg=Debug|Any CPU
582-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Debug|x86.Build.0=Debug|Any CPU
583-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
584-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Proto|Any CPU.Build.0=Proto|Any CPU
585-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Proto|x86.ActiveCfg=Proto|Any CPU
586-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Proto|x86.Build.0=Proto|Any CPU
587-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Release|Any CPU.ActiveCfg=Release|Any CPU
588-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Release|Any CPU.Build.0=Release|Any CPU
589-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Release|x86.ActiveCfg=Release|Any CPU
590-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Release|x86.Build.0=Release|Any CPU
591-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
592-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Debug|Any CPU.Build.0=Debug|Any CPU
593-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Debug|x86.ActiveCfg=Debug|Any CPU
594-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Debug|x86.Build.0=Debug|Any CPU
595-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
596-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Proto|Any CPU.Build.0=Proto|Any CPU
597-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Proto|x86.ActiveCfg=Proto|Any CPU
598-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Proto|x86.Build.0=Proto|Any CPU
599-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Release|Any CPU.ActiveCfg=Release|Any CPU
600-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Release|Any CPU.Build.0=Release|Any CPU
601-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Release|x86.ActiveCfg=Release|Any CPU
602-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Release|x86.Build.0=Release|Any CPU
603-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
604-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Debug|Any CPU.Build.0=Debug|Any CPU
605-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Debug|x86.ActiveCfg=Debug|Any CPU
606-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Debug|x86.Build.0=Debug|Any CPU
607-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
608-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Proto|Any CPU.Build.0=Proto|Any CPU
609-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Proto|x86.ActiveCfg=Proto|Any CPU
610-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Proto|x86.Build.0=Proto|Any CPU
611-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Release|Any CPU.ActiveCfg=Release|Any CPU
612-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Release|Any CPU.Build.0=Release|Any CPU
613-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Release|x86.ActiveCfg=Release|Any CPU
614-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Release|x86.Build.0=Release|Any CPU
615559
{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
616560
{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4}.Debug|Any CPU.Build.0=Debug|Any CPU
617561
{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4}.Debug|x86.ActiveCfg=Debug|Any CPU
@@ -858,10 +802,6 @@ Global
858802
{F7876C9B-FB6A-4EFB-B058-D6967DB75FB2} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
859803
{604F0DAA-2D33-48DD-B162-EDF0B672803D} ={C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
860804
{01678CDA-A11F-4DEE-9344-2EDF91CF1AE7} ={C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
861-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210} ={C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
862-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87} ={C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
863-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5} ={C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
864-
{DB374A0C-7560-479F-9B21-D37C81F7624F} ={C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
865805
{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4} ={C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
866806
{F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
867807
{6BA13AA4-C25F-480F-856B-8E8000299A72} ={F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}

‎fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<TargetType>LIBRARY</TargetType>
1818
<NoWarn>58;75</NoWarn>
1919
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
20-
<DefineConstants>EXTENSIONTYPING;$(DefineConstants)</DefineConstants>
2120
<ResolveNuGetPackages>false</ResolveNuGetPackages>
2221
<OutputPath>..\..\$(Configuration)\fcs\net45\</OutputPath>
2322
<Tailcalls>true</Tailcalls>

‎fcs/FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<DefineConstants>$(DefineConstants);COMPILER_SERVICE</DefineConstants>
1414
<DefineConstants>$(DefineConstants);COMPILER_SERVICE_ASSUMES_FSHARP_CORE_4_4_0_0</DefineConstants>
1515
<DefineConstants>$(DefineConstants);EXTENSIBLE_DUMPER</DefineConstants>
16+
<DefineConstants>$(DefineConstants);NO_EXTENSIONTYPING</DefineConstants>
1617
<DefineConstants>$(DefineConstants);FSHARP_CORE_4_5</DefineConstants>
1718
<DefineConstants>$(DefineConstants);FX_PORTABLE_OR_NETSTANDARD</DefineConstants>
1819
<DefineConstants>$(DefineConstants);FX_ATLEAST_PORTABLE</DefineConstants>
@@ -652,7 +653,7 @@
652653
</Compile>
653654
</ItemGroup>
654655
<ItemGroup>
655-
<PackageReferenceInclude="System.Collections.Immutable"Version="1.4.0" />
656+
<PackageReferenceInclude="System.Collections.Immutable"Version="1.3.1" />
656657
<PackageReferenceInclude="System.Diagnostics.Process"Version="4.1.0" />
657658
<PackageReferenceInclude="System.Diagnostics.TraceSource"Version="4.0.0" />
658659
<PackageReferenceInclude="System.Reflection.Emit"Version="4.3.0" />

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<!-- We target .NET 4.5 for FSharp.Compiler.Service.dll to allow broader use of this DLL-->
2525
<TargetFrameworkVersionCondition=" '$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion>
2626
<TargetFrameworkProfile />
27-
<DefineConstants>$(DefineConstants);EXTENSIONTYPING</DefineConstants>
2827
<DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
2928
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
3029
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
@@ -641,10 +640,10 @@
641640
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.DiaSymReader.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath>
642641
</Reference>
643642
<ReferenceInclude="System.Reflection.Metadata">
644-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.5.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
643+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
645644
</Reference>
646645
<ReferenceInclude="System.Collections.Immutable">
647-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
646+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
648647
</Reference>
649648
<ReferenceInclude="System.ValueTuple">
650649
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>

‎fcs/nuget/FSharp.Compiler.Service.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<summary>F# compiler services for creating IDE tools, language extensions and for F# embedding.</summary>
1515
<dependencies>
1616
<grouptargetFramework="net45">
17-
<dependencyid="System.Collections.Immutable"version="1.4.0" />
17+
<dependencyid="System.Collections.Immutable"version="1.3.1" />
1818
<dependencyid="System.Reflection.Metadata"version="1.4.2" />
1919
</group>
2020
</dependencies>

‎fcs/samples/FscExe/FscExe.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<NoWarn>$(NoWarn);62;44</NoWarn>
1616
<AssemblyName>FscExe</AssemblyName>
1717
<Name>FscExe</Name>
18-
<DefineConstants>EXTENSIONTYPING;$(DefineConstants)</DefineConstants>
1918
<DefineConstants>COMPILER;$(DefineConstants)</DefineConstants>
2019
<DefineConstants>FX_RESIDENT_COMPILER;$(DefineConstants)</DefineConstants>
2120
<AllowCrossTargeting>true</AllowCrossTargeting>

‎packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<packageid="Microsoft.DotNet.Build.Tasks.Feed"version="1.0.0-prerelease-02121-01" />
1616

1717
<!-- Actual dependencies of FSharp.Compiler.dll and FSharp.Core.dll-->
18-
<packageid="System.Collections.Immutable"version="1.4.0" />
19-
<packageid="System.Reflection.Metadata"version="1.5.0" />
18+
<packageid="System.Collections.Immutable"version="1.3.1" />
19+
<packageid="System.Reflection.Metadata"version="1.4.2" />
2020
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.2.0" />
2121
<packageid="Microsoft.DiaSymReader"version="1.1.0" />
2222
<packageid="System.ValueTuple"version="4.3.1" />

‎setup/FSharp.SDK/component-groups/Compiler_Redist.wxs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,11 @@
171171
</Component>
172172

173173
<ComponentId="Compiler_Redist_System.Collections.Immutable.dll"Guid="$(fsharp.guid(Compiler_Redist_System.Collections.Immutable.dll, $(var.LocaleCode)))">
174-
<FileId="Compiler_Redist_System.Collections.Immutable.dll"Source="$(var.NugetPackagesDir)\System.Collections.Immutable.1.4.0\lib\netstandard1.0\System.Collections.Immutable.dll" />
174+
<FileId="Compiler_Redist_System.Collections.Immutable.dll"Source="$(var.NugetPackagesDir)\System.Collections.Immutable.1.3.1\lib\netstandard1.0\System.Collections.Immutable.dll" />
175175
</Component>
176176

177177
<ComponentId="Compiler_Redist_System.Reflection.Metadata.dll"Guid="$(fsharp.guid(Compiler_Redist_System.Reflection.Metadata.dll, $(var.LocaleCode)))">
178-
<FileId="Compiler_Redist_System.Reflection.Metadata.dll"Source="$(var.NugetPackagesDir)\System.Reflection.Metadata.1.5.0\lib\netstandard1.1\System.Reflection.Metadata.dll" />
178+
<FileId="Compiler_Redist_System.Reflection.Metadata.dll"Source="$(var.NugetPackagesDir)\System.Reflection.Metadata.1.4.2\lib\netstandard1.1\System.Reflection.Metadata.dll" />
179179
</Component>
180180

181181
<ComponentId="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll"Guid="$(fsharp.guid(Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll, $(var.LocaleCode)))">

‎setup/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="System.Collections.Immutable"version="1.4.0" />
4-
<packageid="System.Reflection.Metadata"version="1.5.0" />
3+
<packageid="System.Collections.Immutable"version="1.3.1" />
4+
<packageid="System.Reflection.Metadata"version="1.4.2" />
55
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.2.0" />
66
<packageid="Microsoft.DiaSymReader"version="1.1.0" />
77
<packageid="FsSrGen"version="2.0.0"targetFramework="net46" />

‎src/FSharpSource.Settings.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<RoslynVersion>2.3.0-beta2-61719-01</RoslynVersion>
3636
<RoslynVSBinariesVersion>15.0</RoslynVSBinariesVersion>
3737
<RoslynVSPackagesVersion>15.0.26201</RoslynVSPackagesVersion>
38-
<SystemCollectionsImmutableVersion>1.4.0</SystemCollectionsImmutableVersion>
38+
<SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion>
3939
<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.26201</VSSDK_BUILDTOOLS_VERSION>
4040

4141
<MicrosoftVisualStudioThreadingVersion>15.3.23</MicrosoftVisualStudioThreadingVersion>

0 commit comments

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