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

Commit98090d3

Browse files
committed
Update compiler and library code to F# 4.0
1 parent5caef3c commit98090d3

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

‎src/FSharpSource.Settings.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->
33
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>

‎src/FSharpSource.targets‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<IsPortableProfile>true</IsPortableProfile>
1212
</PropertyGroup>
1313
<PropertyGroup>
14-
<OtherFlagsCondition="'$(TargetFramework)' != 'net20' and $(IsPortableProfile) != 'true'">$(OtherFlags) --version:4.3.1.9055</OtherFlags>
15-
<OtherFlagsCondition="'$(TargetFramework)' == 'net20'">$(OtherFlags) --version:2.3.1.9055</OtherFlags>
16-
<OtherFlagsCondition="'$(TargetFramework)' == 'portable7'">$(OtherFlags) --version:3.3.1.9055</OtherFlags>
17-
<OtherFlagsCondition="'$(TargetFramework)' == 'portable47'">$(OtherFlags) --version:2.3.5.9055</OtherFlags>
18-
<OtherFlagsCondition="'$(TargetFramework)' == 'portable78'">$(OtherFlags) --version:3.78.3.9055</OtherFlags>
19-
<OtherFlagsCondition="'$(TargetFramework)' == 'portable259'">$(OtherFlags) --version:3.259.3.9055</OtherFlags>
14+
<OtherFlagsCondition="'$(TargetFramework)' != 'net20' and $(IsPortableProfile) != 'true'">$(OtherFlags) --version:4.4.0.9055</OtherFlags>
15+
<OtherFlagsCondition="'$(TargetFramework)' == 'net20'">$(OtherFlags) --version:2.4.0.9055</OtherFlags>
16+
<OtherFlagsCondition="'$(TargetFramework)' == 'portable7'">$(OtherFlags) --version:3.7.4.9055</OtherFlags>
17+
<OtherFlagsCondition="'$(TargetFramework)' == 'portable47'">$(OtherFlags) --version:3.47.4.9055</OtherFlags>
18+
<OtherFlagsCondition="'$(TargetFramework)' == 'portable78'">$(OtherFlags) --version:3.78.4.9055</OtherFlags>
19+
<OtherFlagsCondition="'$(TargetFramework)' == 'portable259'">$(OtherFlags) --version:3.259.4.9055</OtherFlags>
2020
<OtherFlags>$(OtherFlags) --delaysign+ --keyfile:"$(FSharpSourcesRoot)\fsharp\msft.pubkey"</OtherFlags>
2121
<DefineConstants>STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)</DefineConstants>
2222
<StrongNames>true</StrongNames>
@@ -31,12 +31,12 @@
3131
</When>
3232
<Otherwise>
3333
<PropertyGroupCondition="'$(SIGN_WITH_MSFT_KEY)' == 'true'">
34-
<OtherFlags>$(OtherFlags) --version:4.3.1.9055 --delaysign+ --keyfile:"$(FSharpSourcesRoot)\fsharp\msft.pubkey"</OtherFlags>
34+
<OtherFlags>$(OtherFlags) --version:4.4.0.9055 --delaysign+ --keyfile:"$(FSharpSourcesRoot)\fsharp\msft.pubkey"</OtherFlags>
3535
<DefineConstants>STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)</DefineConstants>
3636
<StrongNames>true</StrongNames>
3737
</PropertyGroup>
3838
<PropertyGroupCondition="'$(SIGN_WITH_MSFT_KEY)' != 'true'">
39-
<OtherFlags>$(OtherFlags) --version:4.3.1.9055 --keyfile:"$(FSharpSourcesRoot)\fsharp\test.snk"</OtherFlags>
39+
<OtherFlags>$(OtherFlags) --version:4.4.0.9055 --keyfile:"$(FSharpSourcesRoot)\fsharp\test.snk"</OtherFlags>
4040
<DefineConstants>STRONG_NAME_FSHARP_COMPILER_WITH_TEST_KEY;$(DefineConstants)</DefineConstants>
4141
<StrongNames>true</StrongNames>
4242
</PropertyGroup>
@@ -58,7 +58,7 @@
5858
<PropertyGroupCondition="'$(StrongNames)' != 'true'">
5959
<!-- For the proto build, portable and Silverlight framework implementations, we don't use strong names.-->
6060
<!-- For Silverlight, there is no way to disable strong name verification, so using the Microsoft name is not possible-->
61-
<OtherFlags>$(OtherFlags) --version:4.3.1.9055</OtherFlags>
61+
<OtherFlags>$(OtherFlags) --version:4.4.0.9055</OtherFlags>
6262
<DefineConstants>NO_STRONG_NAMES;$(DefineConstants)</DefineConstants>
6363
</PropertyGroup>
6464
</Otherwise>

‎src/fsharp/Fsc/fsc.exe.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
publicKeyToken="b03f5f7f11d50a3a"
1010
culture="neutral"/>
1111
<bindingRedirect
12-
oldVersion="2.0.0.0-4.3.1.0"
13-
newVersion="4.3.1.9055"/>
12+
oldVersion="2.0.0.0-4.4.0.0"
13+
newVersion="4.4.0.9055"/>
1414
</dependentAssembly>
1515
</assemblyBinding>
1616
</runtime>

‎src/fsharp/est.fsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module internal ExtensionTyping =
2424

2525
valpartiallyCanonicalizeFileName:string->string
2626

27-
/// location of approvals data file, e.g. C:\Users\username\AppData\Local\Microsoft\VisualStudio\12.0\type-providers.txt
27+
/// location of approvals data file, e.g. C:\Users\username\AppData\Local\Microsoft\VisualStudio\14.0\type-providers.txt
2828
valApprovalsAbsoluteFileName:string
2929

3030
[<RequireQualifiedAccess>]

‎src/fsharp/fsi/fsi.exe.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
publicKeyToken="b03f5f7f11d50a3a"
1010
culture="neutral"/>
1111
<bindingRedirect
12-
oldVersion="2.0.0.0-4.3.1.0"
13-
newVersion="4.3.1.9055"/>
12+
oldVersion="2.0.0.0-4.4.0.0"
13+
newVersion="4.4.0.9055"/>
1414
</dependentAssembly>
1515
</assemblyBinding>
1616
</runtime>

‎src/fsharp/fsi/fsiAnyCPU.exe.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
publicKeyToken="b03f5f7f11d50a3a"
1010
culture="neutral"/>
1111
<bindingRedirect
12-
oldVersion="2.0.0.0-4.3.1.0"
13-
newVersion="4.3.1.9055"/>
12+
oldVersion="2.0.0.0-4.4.0.0"
13+
newVersion="4.4.0.9055"/>
1414
</dependentAssembly>
1515
</assemblyBinding>
1616
</runtime>

‎src/utils/CompilerLocationUtils.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ module internal FSharpEnvironment =
212212

213213
letkey20=@"Software\Microsoft\.NETFramework\AssemblyFolders\Microsoft.FSharp-"+ FSharpTeamVersionNumber
214214
#if FX_ATLEAST_45
215-
letkey40=@"Software\Microsoft\FSharp\3.1\Runtime\v4.0"
215+
letkey40=@"Software\Microsoft\FSharp\4.0\Runtime\v4.0"
216216
#else
217217
letkey40=@"Software\Microsoft\FSharp\2.0\Runtime\v4.0"
218218
#endif

0 commit comments

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