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

Commitac714de

Browse files
committed
Parameterize Visual Studio references
1 parentd877759 commitac714de

File tree

9 files changed

+36
-14
lines changed

9 files changed

+36
-14
lines changed

‎vsintegration/src/Salsa/Salsa.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<ReferenceInclude="System.Xml" />
3737
<ReferenceInclude="System.Windows.Forms" />
3838

39-
<ReferenceInclude="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
39+
<ReferenceInclude="$(VS_Shell_12_Reference)" />
4040
<ReferenceInclude="$(MsBuild_FrameworkReference)" />
4141
<ReferenceInclude="$(MsBuild_EngineReference)" />
4242
<ReferenceInclude="$(MsBuild_Reference)" />

‎vsintegration/src/fsharp.tools.targets‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,29 @@
55
<ImportProject="..\..\..\fsharp.tools.targets"Condition="Exists('..\..\..\fsharp.tools.targets') And '$(DevDivBuild)' == 'true'" />
66
<ImportProject="..\..\src\FSharpSource.Settings.targets"Condition="Exists('..\..\src\FSharpSource.Settings.targets') And '$(DevDivBuild)' != 'true'" />
77

8+
<!-- F# VS Addins have a depedency on VS. Different VS and F# Deployments are dependent on various MsBuild versions-->
9+
<!-- This section sets the VS references the addins require depending on the value of the environment variable-->
10+
<!-- VisualStudioVersion, 12.0 for VS2013, 1 for VS2015-->
11+
<!-- By Default uses VS2013 values-->
12+
<Choose>
13+
<WhenCondition="'$(VisualStudioVersion)' == '14.0'">
14+
<PropertyGroup>
15+
<VS_Shell_12_Reference>Microsoft.VisualStudio.Shell.12.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_12_Reference>
16+
<VS_UI_InternalReference>Microsoft.VisualStudio.Shell.UI.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_UI_InternalReference>
17+
<VS_UtilitiesReference>Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_Utilities>
18+
<VS_PackageLanguageServiceReference>Microsoft.VisualStudio.Package.LanguageService.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_PackageLanguageServiceReference>
19+
</PropertyGroup>
20+
</When>
21+
<Otherwise>
22+
<PropertyGroup>
23+
<VS_Shell_12_Reference>Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_12_Reference>
24+
<VS_UI_InternalReference>Microsoft.VisualStudio.Shell.UI.Internal, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_UI_InternalReference>
25+
<VS_UtilitiesReference>Microsoft.VisualStudio.Utilities, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_Utilities>
26+
<VS_PackageLanguageServiceReference>Microsoft.VisualStudio.Package.LanguageService.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_PackageLanguageServiceReference>
27+
</PropertyGroup>
28+
</Otherwise>
29+
</Choose>
30+
831
<ImportProject="$(MSBuildToolsPath)\Microsoft.CSharp.targets"Condition="'$(DevDivBuild)' == ''" />
932
<ImportProject="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets"Condition="'$(VSToolsPath)' != ''" />
1033

‎vsintegration/src/unittests/Unittests.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<ReferenceInclude="VSLangProj" />
9191
<ReferenceInclude="VSLangProj80" />
9292
<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />
93-
<ReferenceInclude="Microsoft.VisualStudio.Shell.14.0" />
93+
<ReferenceInclude="$(VS_Shell_12_Reference)" />
9494
<ReferenceInclude="Microsoft.VisualStudio.Threading" />
9595
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
9696
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<ReferenceInclude="VSLangProj" />
5353
<ReferenceInclude="VSLangProj80" />
5454
<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />
55-
<ReferenceInclude="Microsoft.VisualStudio.Shell.14.0" />
55+
<ReferenceInclude="$(VS_Shell_12_Reference)" />
5656
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
5757
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
5858
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@
6464
<ReferenceInclude="VSLangProj" />
6565
<ReferenceInclude="VSLangProj80" />
6666
<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />
67-
<ReferenceInclude="Microsoft.VisualStudio.Shell.14.0" />
67+
<ReferenceInclude="$(VS_Shell_12_Reference)" />
6868
<ReferenceInclude="Microsoft.VisualStudio.Threading" />
6969
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
7070
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
7171
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />
7272
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />
7373
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.dll" />
7474
<ReferenceInclude="Microsoft.VisualStudio.Shell.Design" />
75-
<ReferenceInclude="Microsoft.VisualStudio.Package.LanguageService.14.0" />
75+
<ReferenceInclude="$(VS_PackageLanguageServiceReference)" />
7676
<ReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.11.0" />
7777
<ReferenceInclude="Microsoft.VisualStudio.ProjectAggregator" />
7878
<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.dll" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<ReferenceInclude="VSLangProj80" />
6262
<ReferenceInclude="microsoft.visualstudio.vcprojectengine" />
6363
<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />
64-
<ReferenceInclude="Microsoft.VisualStudio.Shell.14.0" />
64+
<ReferenceInclude="$(VS_Shell_12_Reference)" />
6565
<ReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
6666
<ReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
6767
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,9 @@
7171
<ReferenceInclude="$(MsBuild_EngineReference)" />
7272
<ReferenceInclude="$(MsBuild_Reference)" />
7373
<ReferenceInclude="$(MsBuild_UtilitiesReference)" />
74-
<ReferenceInclude="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
75-
<ReferenceInclude="Microsoft.VisualStudio.Shell.UI.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
76-
<ReferenceInclude="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
77-
74+
<ReferenceInclude="$(VS_Shell_12_Reference)" />
75+
<ReferenceInclude="$(VS_Shell_UI_InternalReference)" />
76+
<ReferenceInclude="$(VS_Shell_UtilitiesReference)" />
7877
<ReferenceInclude="System" />
7978
<ReferenceInclude="System.Core" />
8079
<ReferenceInclude="System.Design" />

‎vsintegration/src/vs/FsPkgs/FSharp.Project/VB/FSharpPropPage/FSharp.PropertiesPages.vbproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
6060
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />
6161
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />
62-
<ReferenceInclude="Microsoft.VisualStudio.Shell.14.0" />
62+
<ReferenceInclude="$(VS_Shell_12_Reference)" />
6363
<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.dll" />
6464
<ReferenceInclude="Microsoft.VisualStudio.VSHelp.dll" />
6565
<ReferenceInclude="Microsoft.VisualStudio.WCFReference.Interop.dll" />

‎vsintegration/src/vs/FsPkgs/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
</ItemGroup>
4040
<ItemGroup>
4141
<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll"/>
42-
<ReferenceInclude="Microsoft.VisualStudio.Package.LanguageService.14.0"/>
42+
<ReferenceInclude="$(VS_PackageLanguageServiceReference)"/>
4343
<ReferenceInclude="EnvDTE.dll" />
4444
<ReferenceInclude="EnvDTE80.dll" />
4545
<ReferenceInclude="VSLangProj" />
4646
<ReferenceInclude="VSLangProj80" />
4747
<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />
48-
<ReferenceInclude="Microsoft.VisualStudio.Shell.14.0" />
48+
<ReferenceInclude="$(VS_Shell_12_Reference)" />
4949
<ReferenceInclude="Microsoft.VisualStudio.Threading" />
5050
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
5151
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
@@ -78,7 +78,7 @@
7878
<ReferenceInclude="System.Drawing"/>
7979
<ReferenceInclude="System.Windows.Forms"/>
8080
<ReferenceInclude="System.Xml"/>
81-
<ReferenceInclude="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"/>
81+
<ReferenceInclude="$(VS_UtilitiesReference)"/>
8282
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
8383
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
8484
<Name>FSharp.Core</Name>

0 commit comments

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