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

Commitd877759

Browse files
committed
Parameterize MSBuild references. To enable build in VS2015 or VS1013
1 parentbed6266 commitd877759

File tree

10 files changed

+65
-57
lines changed

10 files changed

+65
-57
lines changed

‎src/FSharpSource.targets‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,33 @@
6464
</Otherwise>
6565
</Choose>
6666

67+
<!-- F# compiler has a depedency on MsBuild. Different VS and F# Deployments carry various MsBuild versions-->
68+
<!-- This section sets the MsBuild references the compiler requires depending on the value of the environment variable-->
69+
<!-- VisualStudioVersion, 12.0 for VS2013, 1 for VS2015-->
70+
<!-- By Default uses VS2013 values-->
71+
<Choose>
72+
<WhenCondition="'$(VisualStudioVersion)' == '14.0'">
73+
<PropertyGroup>
74+
<MsBuild_FrameworkReference>Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_FrameworkReference>
75+
<MsBuild_EngineReference>Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_EngineReference>
76+
<MsBuild_Reference>Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_Reference>
77+
<MsBuild_UtilitiesReference>Microsoft.Build.Utilities.core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_UtilitiesReference>
78+
<MsBuild_TaskReference>Microsoft.Build.Tasks.core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_TaskReference>
79+
<MsBuild_ConversionReference>Microsoft.Build.Conversion.core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_ConversionReference>
80+
</PropertyGroup>
81+
</When>
82+
<Otherwise>
83+
<PropertyGroup>
84+
<MsBuild_FrameworkReference>Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_FrameworkReference>
85+
<MsBuild_EngineReference>Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_EngineReference>
86+
<MsBuild_Reference>Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_Reference>
87+
<MsBuild_UtilitiesReference>Microsoft.Build.Utilities.V12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_UtilitiesReference>
88+
<MsBuild_TaskReference>Microsoft.Build.Tasks.V12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_TaskReference>
89+
<MsBuild_ConversionReference>Microsoft.Build.Conversion.V12, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_ConversionReference>
90+
</PropertyGroup>
91+
</Otherwise>
92+
</Choose>
93+
6794
<!-- For the proto build, portable and Silverlight framework implementations, we don't use strong names.-->
6895
<!-- For Silverlight, there is no way to disable strong name verification, so using the Microsoft name is not possible-->
6996
<PropertyGroupCondition="'$(StrongNames)' != 'true'">
@@ -101,7 +128,7 @@
101128
<PropertyGroupCondition="'$(TargetFramework)'=='net20'">
102129
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
103130
<DefineConstants>$(DefineConstants);FSHARP_CORE_2_0</DefineConstants>
104-
<DefineConstants>$(DefineConstants);RUNTIME</DefineConstants>
131+
<DefineConstants>$(DefineConstants);RUNTIME</DefineConstants>
105132
<DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
106133
<DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
107134
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
<ItemGroup>
4545
<ReferenceInclude="mscorlib" />
4646
<ReferenceInclude="System" />
47-
<ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
48-
<ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
49-
<ReferenceInclude="Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
50-
<ReferenceInclude="Microsoft.Build.Utilities.core" />
51-
<ReferenceInclude="Microsoft.Build.Tasks.core" />
47+
<ReferenceInclude="$(MsBuild_FrameworkReference)" />
48+
<ReferenceInclude="$(MsBuild_EngineReference)" />
49+
<ReferenceInclude="$(MsBuild_Reference)" />
50+
<ReferenceInclude="$(MsBuild_UtilitiesReference)" />
51+
<ReferenceInclude="$(MsBuild_TaskReference)" />
5252
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
5353
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
5454
<Name>FSharp.Core</Name>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -527,12 +527,12 @@
527527
<ReferenceInclude="System.Drawing" />
528528
<ReferenceInclude="System.Windows.Forms" />
529529
<ReferenceInclude="System.Runtime.Remoting" />
530-
<ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
531-
<ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
532530
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
533-
<ReferenceInclude="Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
534-
<ReferenceInclude="Microsoft.Build.Utilities.core" />
535-
<ReferenceInclude="Microsoft.Build.Tasks.core" />
531+
<ReferenceInclude="$(MsBuild_FrameworkReference)" />
532+
<ReferenceInclude="$(MsBuild_EngineReference)" />
533+
<ReferenceInclude="$(MsBuild_Reference)" />
534+
<ReferenceInclude="$(MsBuild_UtilitiesReference)" />
535+
<ReferenceInclude="$(MsBuild_TaskReference)" />
536536
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
537537
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
538538
<Name>FSharp.Core</Name>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -472,12 +472,12 @@
472472
<ReferenceInclude="System.Drawing" />
473473
<ReferenceInclude="System.Windows.Forms" />
474474
<ReferenceInclude="System.Runtime.Remoting" />
475-
<ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
476-
<ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
477475
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
478-
<ReferenceInclude="Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
479-
<ReferenceInclude="Microsoft.Build.Utilities.core" />
480-
<ReferenceInclude="Microsoft.Build.Tasks.core" />
476+
<ReferenceInclude="$(MsBuild_FrameworkReference)" />
477+
<ReferenceInclude="$(MsBuild_EngineReference)" />
478+
<ReferenceInclude="$(MsBuild_Reference)" />
479+
<ReferenceInclude="$(MsBuild_UtilitiesReference)" />
480+
<ReferenceInclude="$(MsBuild_TaskReference)" />
481481
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" >
482482
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
483483
<Name>FSharp.Core</Name>

‎vsintegration/src/Salsa/Salsa.fsproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
<ReferenceInclude="System.Windows.Forms" />
3838

3939
<ReferenceInclude="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
40-
<ReferenceInclude="Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
41-
<ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
42-
<ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
43-
<ReferenceInclude="Microsoft.Build.Utilities.core" />
40+
<ReferenceInclude="$(MsBuild_FrameworkReference)" />
41+
<ReferenceInclude="$(MsBuild_EngineReference)" />
42+
<ReferenceInclude="$(MsBuild_Reference)" />
43+
<ReferenceInclude="$(MsBuild_UtilitiesReference)" />
4444
<ReferenceInclude="EnvDTE.dll" />
4545
<ReferenceInclude="EnvDTE80.dll" />
4646
<ReferenceInclude="VSLangProj" />

‎vsintegration/src/unittests/Unittests.fsproj‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,10 @@
8080
<ReferenceInclude="System.Xaml" />
8181
<ReferenceInclude="WindowsBase" />
8282
<ReferenceInclude="UIAutomationTypes" />
83-
<ReferenceInclude="Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
84-
<SpecificVersion>true</SpecificVersion>
85-
</Reference>
86-
<ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
87-
<SpecificVersion>true</SpecificVersion>
88-
</Reference>
89-
<ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
90-
<SpecificVersion>true</SpecificVersion>
91-
</Reference>
92-
<ReferenceInclude="Microsoft.Build.Utilities.core" />
83+
<ReferenceInclude="$(MsBuild_FrameworkReference)" />
84+
<ReferenceInclude="$(MsBuild_EngineReference)" />
85+
<ReferenceInclude="$(MsBuild_Reference)" />
86+
<ReferenceInclude="$(MsBuild_UtilitiesReference)" />
9387
<ReferenceInclude="Microsoft.Build.Utilities.v3.5.dll" />
9488
<ReferenceInclude="EnvDTE.dll" />
9589
<ReferenceInclude="EnvDTE80.dll" />

‎vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,8 @@
3838
</PropertyGroup>
3939
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
4040
<ItemGroup>
41-
<ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
42-
<SpecificVersion>true</SpecificVersion>
43-
</Reference>
44-
<ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
45-
<SpecificVersion>true</SpecificVersion>
46-
</Reference>
41+
<ReferenceInclude=$(MsBuild_FrameworkReference) />
42+
<ReferenceInclude=$(MsBuild_EngineReference) />
4743
<ReferenceInclude="microsoft.msxml" />
4844
<ReferenceInclude="System.Drawing" />
4945
<ReferenceInclude="System" />

‎vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.fsproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,8 @@
5757
<ReferenceInclude="System.Configuration" />
5858
<ReferenceInclude="System.Drawing" />
5959
<ReferenceInclude="System.Windows.Forms" />
60-
<ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
61-
<SpecificVersion>true</SpecificVersion>
62-
</Reference>
63-
<ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
64-
<SpecificVersion>true</SpecificVersion>
65-
</Reference>
60+
<ReferenceInclude=$(MsBuild_FrameworkReference) />
61+
<ReferenceInclude=$(MsBuild_EngineReference) />
6662
<ReferenceInclude="EnvDTE.dll" />
6763
<ReferenceInclude="EnvDTE80.dll" />
6864
<ReferenceInclude="VSLangProj" />

‎vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/ProjectSystem.Base.csproj‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,12 @@
3737
<DelaySign>true</DelaySign>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<ReferenceInclude="Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
41-
<SpecificVersion>true</SpecificVersion>
42-
</Reference>
43-
<ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
44-
<SpecificVersion>true</SpecificVersion>
45-
</Reference>
46-
<ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
47-
<SpecificVersion>true</SpecificVersion>
48-
</Reference>
49-
<ReferenceInclude="Microsoft.Build.Utilities.core" />
50-
<ReferenceInclude="Microsoft.Build.Conversion.core" />
40+
<ReferenceInclude="$(MsBuild_FrameworkReference)" />
41+
<ReferenceInclude="$(MsBuild_EngineReference)" />
42+
<ReferenceInclude="$(MsBuild_Reference)" />
43+
<ReferenceInclude="$(MsBuild_UtilitiesReference)" />
44+
<ReferenceInclude="$(MsBuild_TaskReference)" />
45+
<ReferenceInclude="$(MsBuild_ConversionReference)" />
5146
<ReferenceInclude="System" />
5247
<ReferenceInclude="System.Core" />
5348
<ReferenceInclude="System.Xml" />

‎vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ProjectSystem.fsproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@
6767
<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
6868
<ReferenceInclude="Microsoft.VisualStudio.Designer.Interfaces" />
6969
<ReferenceInclude="Microsoft.VisualStudio.VSHelp.dll" />
70-
<ReferenceInclude="Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
71-
<ReferenceInclude="Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
72-
<ReferenceInclude="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
70+
<ReferenceInclude="$(MsBuild_FrameworkReference)" />
71+
<ReferenceInclude="$(MsBuild_EngineReference)" />
72+
<ReferenceInclude="$(MsBuild_Reference)" />
73+
<ReferenceInclude="$(MsBuild_UtilitiesReference)" />
7374
<ReferenceInclude="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
7475
<ReferenceInclude="Microsoft.VisualStudio.Shell.UI.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
7576
<ReferenceInclude="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
76-
<ReferenceInclude="Microsoft.Build.Utilities.core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
7777

7878
<ReferenceInclude="System" />
7979
<ReferenceInclude="System.Core" />

0 commit comments

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