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

Commit457c406

Browse files
authored
Merge branch 'dev15.6' into merges/master-to-dev15.6-20171211-080040
2 parentsd19fb00 +aa5307e commit457c406

File tree

118 files changed

+547
-441
lines changed

Some content is hidden

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

118 files changed

+547
-441
lines changed

‎.nuget/NuGet.Config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<addkey="myget.org roslyn-tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1717
<addkey="api.nuget.org"value="https://api.nuget.org/v3/index.json" />
1818
<addkey="myget.org roslyn tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
19-
<addkey="myget.org roslyn"value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
19+
<addkey="myget.org roslyn"value="https://dotnet.myget.org/F/roslyn-for-vs-for-mac/api/v3/index.json" />
2020
</packageSources>
2121

2222
</configuration>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
</Reference>
7878
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools-->
7979
<ReferenceInclude="FSharp.Core">
80-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
80+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
8181
<Private>false</Private>
8282
</Reference>
8383
</ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<ReferenceInclude="System.Xml" />
4747
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools-->
4848
<ReferenceInclude="FSharp.Core">
49-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
49+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
5050
<Private>false</Private>
5151
</Reference>
5252
</ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<ReferenceInclude="System.Xml" />
5959
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools-->
6060
<ReferenceInclude="FSharp.Core">
61-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
61+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
6262
<Private>false</Private>
6363
</Reference>
6464
</ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@
651651

652652
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools-->
653653
<ReferenceInclude="FSharp.Core">
654-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
654+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
655655
<Private>false</Private>
656656
</Reference>
657657
</ItemGroup>

‎fcs/samples/EditorService/EditorService.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<ItemGroup>
4242
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools-->
4343
<ReferenceInclude="FSharp.Core">
44-
<HintPath>$(SolutionDir)\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
44+
<HintPath>$(SolutionDir)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
4545
<Private>false</Private>
4646
</Reference>
4747
<ReferenceInclude="mscorlib" />

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<packageid="FSharp.Compiler.Tools"version="4.1.27"/>
4646

4747
<!-- Frozen portable library versions of FSharp.Core.dll (simply a renamed fsharp.core.4.1.18-->
48-
<packageid="Microsoft.Portable.FSharp.Core"version="4.1.20"/>
48+
<packageid="Microsoft.Portable.FSharp.Core"version="4.3.0"/>
4949

5050
<!-- FSharp.Core is used to get back versions of FSharp.Core-->
5151
<packageid="FSharp.Core"version="4.1.17"/>

‎setup/FSharp.SDK/Common.Wix.Properties.wxs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<DirectoryId="ReferenceAssemblies_Microsoft_FSharp"Name="FSharp">
1212
<DirectoryId="ReferenceAssemblies_Microsoft_FSharp_NETFramework"Name=".NETFramework">
1313
<DirectoryId="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0"Name="v4.0">
14+
<DirectoryId="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.3.0"Name="4.4.3.0">
15+
<DirectoryId="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.3.0_$(var.LocaleId)"Name="$(var.LocaleParentCulture)" />
16+
</Directory>
1417
<DirectoryId="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0"Name="4.4.1.0">
1518
<DirectoryId="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LocaleId)"Name="$(var.LocaleParentCulture)" />
1619
</Directory>
@@ -78,10 +81,10 @@
7881

7982
<DirectoryId="MicrosoftSDKs"Name="Microsoft SDKs">
8083
<DirectoryId="MicrosoftSDKs_FS"Name="F#">
81-
<DirectoryId="MicrosoftSDKs_FS_4.1"Name="4.1">
82-
<DirectoryId="MicrosoftSDKs_FS_4.1_Framework"Name="Framework">
83-
<DirectoryId="MicrosoftSDKs_FS_4.1_Framework_v4.0"Name="v4.0">
84-
<DirectoryId="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)"Name="$(var.LocaleParentCulture)" />
84+
<DirectoryId="MicrosoftSDKs_FS_4.3"Name="4.3">
85+
<DirectoryId="MicrosoftSDKs_FS_4.3_Framework"Name="Framework">
86+
<DirectoryId="MicrosoftSDKs_FS_4.3_Framework_v4.0"Name="v4.0">
87+
<DirectoryId="MicrosoftSDKs_FS_4.3_Framework_v4.0_$(var.LocaleId)"Name="$(var.LocaleParentCulture)" />
8588
</Directory>
8689
</Directory>
8790
</Directory>

‎setup/FSharp.SDK/FSharp.SDK.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
33
<Wixxmlns="http://schemas.microsoft.com/wix/2006/wi">
44

5-
<?define ProductVersion ="4.1"?>
5+
<?define ProductVersion ="4.3"?>
66
<?define ProductPlatform ="x86"?>
77
<?define ProductManufacturer ="Microsoft Corporation"?>
88
<?define ProductDescription ="Visual F# $(var.ProductVersion) SDK"?>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ComponentRefId="Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode)" />
1010
</ComponentGroup>
1111

12-
<DirectoryRefId="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)">
12+
<DirectoryRefId="MicrosoftSDKs_FS_4.3_Framework_v4.0_$(var.LocaleId)">
1313
<ComponentId="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode), $(var.LocaleCode)))">
1414
<FileId="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Core.resources.dll"KeyPath="yes" />
1515
</Component>

0 commit comments

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