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

Commit0577284

Browse files
committed
Update open build to target .NET 4.5 and MSBuild 12. This aligns the open build with what ships in VS 2013 and F# 3.1.1 OOB.
Also stripping out some unnecessary configuration checking - 'net40' is the only supported TargetFramework for building the compiler, build libraries, and type providers. Only FSharp.Core supports other target platforms. (changeset 1227697)
1 parent8275213 commit0577284

File tree

6 files changed

+40
-57
lines changed

6 files changed

+40
-57
lines changed

‎src/FSharpSource.targets‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@
9090
</PropertyGroup>
9191

9292
<PropertyGroupCondition="'$(TargetFramework)'=='net40'">
93-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
93+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
94+
<DefineConstants>$(DefineConstants);FSHARP_CORE_4_5</DefineConstants>
95+
<DefineConstants>$(DefineConstants);FX_ATLEAST_45</DefineConstants>
9496
<DefineConstants>$(DefineConstants);FX_ATLEAST_40</DefineConstants>
9597
<DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
9698
<DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>
@@ -559,6 +561,10 @@
559561
'$(TargetFramework)' == 'sl5-compiler' or
560562
'$(TargetFramework)' == 'sl3-wp' or
561563
'$(TargetFramework)' == 'portable47')"/>
564+
<Error
565+
Text="TargetFramework '$(TargetFramework)' is only supported when building FSharp.Core.dll. All other components must be built with TargetFramework=net40"
566+
Condition="'$(AssemblyName)' != 'FSharp.Core' and '$(TargetFramework)' != 'net40'"/>
567+
562568
</Target>
563569

564570
<!-- This build step copies files to the output folder while replacing build variables in the text of

‎src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<DefineConstants>BUILDING_WITH_LKG;$(DefineConstants)</DefineConstants>
1515
<BuildWith>LKG</BuildWith>
1616
<ProjectGuid>{D8BC791F-C1A9-49DC-9432-0F3090537555}</ProjectGuid>
17-
<TargetFrameworkVersionCondition="'$(TargetFramework)'=='net20'">v3.5</TargetFrameworkVersion>
1817
</PropertyGroup>
1918
<ItemGroup>
2019
<FsSrGenInclude="..\FSharp.Build\FSBuild.txt">
@@ -47,14 +46,12 @@
4746
<ReferenceInclude="mscorlib" />
4847
<ReferenceInclude="$(FSCoreLKGPath)" />
4948
<ReferenceInclude="System" />
50-
<ReferenceInclude="System.Numerics"Condition="'$(TargetFramework)'=='net40'" />
51-
<ReferenceInclude="Microsoft.Build.Engine" />
52-
<ReferenceInclude="Microsoft.Build.Utilities.v3.5"Condition="'$(TargetFramework)' == 'net20'" />
53-
<ReferenceInclude="Microsoft.Build.Tasks.v3.5"Condition="'$(TargetFramework)' == 'net20'" />
54-
<ReferenceInclude="Microsoft.Build"Condition="'$(TargetFramework)'=='net40'" />
55-
<ReferenceInclude="Microsoft.Build.Framework"Condition="'$(TargetFramework)'=='net40'" />
56-
<ReferenceInclude="Microsoft.Build.Utilities.v4.0"Condition="'$(TargetFramework)'=='net40'" />
57-
<ReferenceInclude="Microsoft.Build.Tasks.v4.0"Condition="'$(TargetFramework)'=='net40'" />
49+
<ReferenceInclude="System.Numerics" />
50+
<ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
51+
<ReferenceInclude="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
52+
<ReferenceInclude="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
53+
<ReferenceInclude="Microsoft.Build.Utilities.v12.0" />
54+
<ReferenceInclude="Microsoft.Build.Tasks.v12.0" />
5855
</ItemGroup>
5956
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
6057
</Project>

‎src/fsharp/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<OutputType>Library</OutputType>
1212
<AssemblyName>FSharp.Build</AssemblyName>
1313
<AllowCrossTargeting>true</AllowCrossTargeting>
14-
<TargetFrameworkVersionCondition="'$(TargetFramework)'=='net20'">v3.5</TargetFrameworkVersion>
1514
<ProjectGuid>{702A7979-BCF9-4C41-853E-3ADFC9897890}</ProjectGuid>
1615
</PropertyGroup>
1716
<ItemGroup>
@@ -44,19 +43,15 @@
4443
<ItemGroup>
4544
<ReferenceInclude="mscorlib" />
4645
<ReferenceInclude="System" />
47-
48-
<ReferenceInclude="Microsoft.Build.Engine" />
49-
<ReferenceInclude="Microsoft.Build.Framework" />
50-
<ReferenceInclude="Microsoft.Build.Utilities.v3.5"Condition="'$(TargetFramework)'=='net20'" />
51-
<ReferenceInclude="Microsoft.Build.Tasks.v3.5"Condition="'$(TargetFramework)'=='net20'" />
52-
53-
<ReferenceInclude="Microsoft.Build"Condition="'$(TargetFramework)'=='net40'" />
54-
<ReferenceInclude="Microsoft.Build.Utilities.v4.0"Condition="'$(TargetFramework)'=='net40'" />
55-
<ReferenceInclude="Microsoft.Build.Tasks.v4.0"Condition="'$(TargetFramework)'=='net40'" />
46+
<ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
47+
<ReferenceInclude="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
48+
<ReferenceInclude="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
49+
<ReferenceInclude="Microsoft.Build.Utilities.v12.0" />
50+
<ReferenceInclude="Microsoft.Build.Tasks.v12.0" />
5651
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
57-
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
58-
<Name>FSharp.Core</Name>
59-
</ProjectReference>
52+
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
53+
<Name>FSharp.Core</Name>
54+
</ProjectReference>
6055
</ItemGroup>
6156
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
6257
</Project>

‎src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<BuildWith>LKG</BuildWith>
1717
<AllowCrossTargeting>true</AllowCrossTargeting>
1818
<OtherFlags>$(OtherFlags) --warnon:1182</OtherFlags>
19-
<TargetFrameworkVersionCondition="'$(TargetFramework)'=='net20'">v2.0</TargetFrameworkVersion>
2019
</PropertyGroup>
2120
<ItemGroup>
2221
<FsSrGenInclude="..\FSComp.txt">
@@ -417,18 +416,14 @@
417416
<ReferenceInclude="System" />
418417
<ReferenceInclude="System.Windows.Forms" />
419418
<ReferenceInclude="System.Drawing" />
419+
<ReferenceInclude="System.Numerics" />
420420
<ReferenceInclude="System.Runtime.Remoting" />
421-
<ReferenceInclude="Microsoft.Build.Framework" />
422-
<ReferenceInclude="Microsoft.Build.Engine" />
423-
424-
<ReferenceInclude="System.Numerics"Condition="'$(TargetFramework)' == 'net40'" />
425-
<ReferenceInclude="Microsoft.Build.Utilities"Condition="'$(TargetFramework)' == 'net20'" />
426-
<ReferenceInclude="Microsoft.Build.Tasks"Condition="'$(TargetFramework)' == 'net20'" />
427-
428-
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"Condition="'$(TargetFramework)'=='net40'" />
429-
<ReferenceInclude="Microsoft.Build"Condition="'$(TargetFramework)'=='net40'" />
430-
<ReferenceInclude="Microsoft.Build.Utilities.v4.0"Condition="'$(TargetFramework)'=='net40'" />
431-
<ReferenceInclude="Microsoft.Build.Tasks.v4.0"Condition="'$(TargetFramework)'=='net40'" />
421+
<ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
422+
<ReferenceInclude="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
423+
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
424+
<ReferenceInclude="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
425+
<ReferenceInclude="Microsoft.Build.Utilities.v12.0" />
426+
<ReferenceInclude="Microsoft.Build.Tasks.v12.0" />
432427

433428
</ItemGroup>
434429
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<NoWarn>$(NoWarn);44;62;9</NoWarn>
1515
<ProjectGuid>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</ProjectGuid>
1616
<AllowCrossTargeting>true</AllowCrossTargeting>
17-
<TargetFrameworkVersionCondition="'$(TargetFramework)'=='net20'">v2.0</TargetFrameworkVersion>
1817
<BaseAddress>0x06800000</BaseAddress>
1918
<OtherFlags>$(OtherFlags) /warnon:1182</OtherFlags>
2019
</PropertyGroup>
@@ -502,17 +501,12 @@
502501
<ReferenceInclude="System.Drawing" />
503502
<ReferenceInclude="System.Windows.Forms" />
504503
<ReferenceInclude="System.Runtime.Remoting" />
505-
<ReferenceInclude="Microsoft.Build.Framework" />
506-
<ReferenceInclude="Microsoft.Build.Engine" />
507-
<ReferenceInclude="Microsoft.Build.Utilities"Condition="'$(TargetFramework)'=='net20'" />
508-
<ReferenceInclude="Microsoft.Build.Tasks"Condition="'$(TargetFramework)'=='net20'" />
509-
510-
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"Condition="'$(TargetFramework)'=='net40'" />
511-
<ReferenceInclude="Microsoft.Build"Condition="'$(TargetFramework)'=='net40'" />
512-
<ReferenceInclude="Microsoft.Build.Utilities.v4.0"Condition="'$(TargetFramework)'=='net40'" />
513-
<ReferenceInclude="Microsoft.Build.Tasks.v4.0"Condition="'$(TargetFramework)'=='net40'" />
514-
515-
504+
<ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
505+
<ReferenceInclude="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
506+
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
507+
<ReferenceInclude="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
508+
<ReferenceInclude="Microsoft.Build.Utilities.v12.0" />
509+
<ReferenceInclude="Microsoft.Build.Tasks.v12.0" />
516510
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" >
517511
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
518512
<Name>FSharp.Core</Name>

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<NoWarn>$(NoWarn);62;44;9;75</NoWarn>
2525
<ProjectGuid>{a437a6ec-5323-47c2-8f86-e2cac54ff152}</ProjectGuid>
2626
<AllowCrossTargeting>true</AllowCrossTargeting>
27-
<TargetFrameworkVersionCondition="'$(TargetFramework)'=='net20'">v2.0</TargetFrameworkVersion>
2827
<BaseAddress>0x06800000</BaseAddress>
2928
<OtherFlags>$(OtherFlags) /warnon:1182 /version:11.0.0.0</OtherFlags>
3029
</PropertyGroup>
@@ -454,15 +453,12 @@
454453
<ReferenceInclude="System.Drawing" />
455454
<ReferenceInclude="System.Windows.Forms" />
456455
<ReferenceInclude="System.Runtime.Remoting" />
457-
<ReferenceInclude="Microsoft.Build.Framework" />
458-
<ReferenceInclude="Microsoft.Build.Engine" />
459-
<ReferenceInclude="Microsoft.Build.Utilities"Condition="'$(TargetFramework)'=='net20'" />
460-
<ReferenceInclude="Microsoft.Build.Tasks"Condition="'$(TargetFramework)'=='net20'" />
461-
462-
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"Condition="'$(TargetFramework)'=='net40'" />
463-
<ReferenceInclude="Microsoft.Build"Condition="'$(TargetFramework)'=='net40'" />
464-
<ReferenceInclude="Microsoft.Build.Utilities.v4.0"Condition="'$(TargetFramework)'=='net40'" />
465-
<ReferenceInclude="Microsoft.Build.Tasks.v4.0"Condition="'$(TargetFramework)'=='net40'" />
456+
<ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
457+
<ReferenceInclude="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
458+
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
459+
<ReferenceInclude="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
460+
<ReferenceInclude="Microsoft.Build.Utilities.v12.0" />
461+
<ReferenceInclude="Microsoft.Build.Tasks.v12.0" />
466462

467463

468464
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" >

0 commit comments

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