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

Commitea8361e

Browse files
committed
Enable building with VS2013
1 parentac714de commitea8361e

File tree

14 files changed

+87
-66
lines changed

14 files changed

+87
-66
lines changed
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- 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.-->
3+
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4+
<!-- F# compiler has a depedency on MsBuild. Different VS and F# Deployments carry various MsBuild versions-->
5+
<!-- This section sets the MsBuild references the compiler requires depending on the value of the environment variable-->
6+
<!-- VisualStudioVersion, 12.0 for VS2013, 1 for VS2015-->
7+
<!-- By Default uses VS2013 values-->
8+
<Choose>
9+
<WhenCondition="'$(VisualStudioVersion)' == '14.0'">
10+
<PropertyGroup>
11+
<MsBuild_FrameworkReference>Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_FrameworkReference>
12+
<MsBuild_EngineReference>Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_EngineReference>
13+
<MsBuild_Reference>Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_Reference>
14+
<MsBuild_UtilitiesReference>Microsoft.Build.Utilities.core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_UtilitiesReference>
15+
<MsBuild_TaskReference>Microsoft.Build.Tasks.core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_TaskReference>
16+
<MsBuild_ConversionReference>Microsoft.Build.Conversion.core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_ConversionReference>
17+
</PropertyGroup>
18+
</When>
19+
<Otherwise>
20+
<PropertyGroup>
21+
<MsBuild_FrameworkReference>Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_FrameworkReference>
22+
<MsBuild_EngineReference>Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_EngineReference>
23+
<MsBuild_Reference>Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_Reference>
24+
<MsBuild_UtilitiesReference>Microsoft.Build.Utilities.V12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_UtilitiesReference>
25+
<MsBuild_TaskReference>Microsoft.Build.Tasks.V12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_TaskReference>
26+
<MsBuild_ConversionReference>Microsoft.Build.Conversion.V12, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_ConversionReference>
27+
</PropertyGroup>
28+
</Otherwise>
29+
</Choose>
30+
</Project>

‎src/FSharpSource.targets‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -64,32 +64,7 @@
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>
67+
<ImportProject="FSharpSource.msbuildreferences.targets" />
9368

9469
<!-- For the proto build, portable and Silverlight framework implementations, we don't use strong names.-->
9570
<!-- For Silverlight, there is no way to disable strong name verification, so using the Microsoft name is not possible-->

‎tests/RunTests.cmd‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
setlocal
33

44
setFLAVOR=%1
5-
if /I"%FLAVOR%"=="debug" (goto :FLAVOR_OK)
6-
if /I"%FLAVOR%"=="release" (goto :FLAVOR_OK)
5+
if /I"%FLAVOR%"=="debug" (goto :FLAVOR_OK)
6+
if /I"%FLAVOR%"=="release" (goto :FLAVOR_OK)
7+
if /I"%FLAVOR%"=="vsdebug" (goto :FLAVOR_OK)
8+
if /I"%FLAVOR%"=="vsrelease" (goto :FLAVOR_OK)
79
goto :USAGE
810

911
:flavor_ok
@@ -79,7 +81,7 @@ if /I "%2" == "ideunit" (goto :IDEUNIT)
7981

8082
echo Usage:
8183
echo.
82-
echo RunTests.cmd^<debug^|release^>^<fsharp^|fsharpqa^|coreunit^|coreunitportable47^|coreunitportable7^|coreunitportable78^|coreunit259^|ideunit^|compilerunit^> [TagToRun^|"Tags,To,Run"] [TagNotToRun^|"Tags,Not,To,Run"]
84+
echo RunTests.cmd^<debug^|release^|vsdebug^|vsrelease^>^<fsharp^|fsharpqa^|coreunit^|coreunitportable47^|coreunitportable7^|coreunitportable78^|coreunit259^|ideunit^|compilerunit^> [TagToRun^|"Tags,To,Run"] [TagNotToRun^|"Tags,Not,To,Run"]
8385
echo.
8486
exit /b1
8587

‎vsintegration/src/Salsa/Salsa.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>
88
</PropertyGroup>
99
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
10+
<ImportProject="$(ProjectDirectory)..\fsharp.vsreferences.targets" />
1011
<PropertyGroup>
1112
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
1213
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
@@ -36,7 +37,7 @@
3637
<ReferenceInclude="System.Xml" />
3738
<ReferenceInclude="System.Windows.Forms" />
3839

39-
<ReferenceInclude="$(VS_Shell_12_Reference)" />
40+
<ReferenceInclude="$(VS_Shell_Reference)" />
4041
<ReferenceInclude="$(MsBuild_FrameworkReference)" />
4142
<ReferenceInclude="$(MsBuild_EngineReference)" />
4243
<ReferenceInclude="$(MsBuild_Reference)" />

‎vsintegration/src/fsharp.tools.targets‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,6 @@
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-
318
<ImportProject="$(MSBuildToolsPath)\Microsoft.CSharp.targets"Condition="'$(DevDivBuild)' == ''" />
329
<ImportProject="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets"Condition="'$(VSToolsPath)' != ''" />
3310

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- 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.-->
3+
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4+
5+
<!-- F# VS Addins have a depedency on VS. Different VS and F# Deployments are dependent on various MsBuild versions-->
6+
<!-- This section sets the VS references the addins require depending on the value of the environment variable-->
7+
<!-- VisualStudioVersion, 12.0 for VS2013, 1 for VS2015-->
8+
<!-- By Default uses VS2013 values-->
9+
<Choose>
10+
<WhenCondition="'$(VisualStudioVersion)' == '14.0'">
11+
<PropertyGroup>
12+
<VS_Shell_Reference>Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_Reference>
13+
<VS_Shell_UI_InternalReference>Microsoft.VisualStudio.Shell.UI.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_UI_InternalReference>
14+
<VS_UtilitiesReference>Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_UtilitiesReference>
15+
<VS_PackageLanguageServiceReference>Microsoft.VisualStudio.Package.LanguageService.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_PackageLanguageServiceReference>
16+
</PropertyGroup>
17+
</When>
18+
<Otherwise>
19+
<PropertyGroup>
20+
<VS_Shell_Reference>Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_Reference>
21+
<VS_Shell_UI_InternalReference>Microsoft.VisualStudio.Shell.UI.Internal, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_UI_InternalReference>
22+
<VS_UtilitiesReference>Microsoft.VisualStudio.Utilities, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_UtilitiesReference>
23+
<VS_PackageLanguageServiceReference>Microsoft.VisualStudio.Package.LanguageService.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_PackageLanguageServiceReference>
24+
</PropertyGroup>
25+
</Otherwise>
26+
</Choose>
27+
</Project>

‎vsintegration/src/unittests/Unittests.fsproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@
77
<SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>
88
</PropertyGroup>
99
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
10+
<ImportProject="$(ProjectDirectory)..\fsharp.vsreferences.targets" />
1011
<PropertyGroup>
1112
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
12-
<Platform>x86</Platform>
1313
<SchemaVersion>2.0</SchemaVersion>
1414
<ProjectGuid>{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}</ProjectGuid>
1515
<OutputType>Library</OutputType>
1616
<AssemblyName>Unittests</AssemblyName>
1717
<GenerateInterfaceFile>Unittests.fsi</GenerateInterfaceFile>
1818
<TargetType>LIBRARY</TargetType>
1919
<NoWarn>58;75</NoWarn>
20+
<PlatformTarget>x86</PlatformTarget>
2021
</PropertyGroup>
2122
<ItemGroup>
2223
<CompileInclude="$(FSharpSourcesRoot)\fsharp\InternalCollections.fsi">
@@ -90,7 +91,7 @@
9091
<ReferenceInclude="VSLangProj" />
9192
<ReferenceInclude="VSLangProj80" />
9293
<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />
93-
<ReferenceInclude="$(VS_Shell_12_Reference)" />
94+
<ReferenceInclude="$(VS_Shell_Reference)" />
9495
<ReferenceInclude="Microsoft.VisualStudio.Threading" />
9596
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
9697
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>
88
</PropertyGroup>
99
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
10+
<ImportProject="$(ProjectDirectory)..\..\..\fsharp.vsreferences.targets" />
1011
<PropertyGroup>
1112
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
1213
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@
3737
<DelaySign>true</DelaySign>
3838
</PropertyGroup>
3939
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
40+
<ImportProject="$(ProjectDirectory)..\..\..\..\fsharp.vsreferences.targets" />
4041
<ItemGroup>
41-
<ReferenceInclude=$(MsBuild_FrameworkReference) />
42-
<ReferenceInclude=$(MsBuild_EngineReference) />
42+
<ReferenceInclude="$(MsBuild_FrameworkReference)" />
43+
<ReferenceInclude="$(MsBuild_EngineReference)" />
4344
<ReferenceInclude="microsoft.msxml" />
4445
<ReferenceInclude="System.Drawing" />
4546
<ReferenceInclude="System" />
@@ -52,7 +53,7 @@
5253
<ReferenceInclude="VSLangProj" />
5354
<ReferenceInclude="VSLangProj80" />
5455
<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />
55-
<ReferenceInclude="$(VS_Shell_12_Reference)" />
56+
<ReferenceInclude="$(VS_Shell_Reference)" />
5657
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
5758
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
5859
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>
2222
</PropertyGroup>
2323
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
24+
<ImportProject="$(ProjectDirectory)..\..\..\fsharp.vsreferences.targets" />
2425
<ItemGroup>
2526
<EmbeddedResourceInclude="VSPackage.resx" />
2627
<EmbeddedResourceInclude="FSLangSvcStrings.resx" />
@@ -57,14 +58,14 @@
5758
<ReferenceInclude="System.Configuration" />
5859
<ReferenceInclude="System.Drawing" />
5960
<ReferenceInclude="System.Windows.Forms" />
60-
<ReferenceInclude=$(MsBuild_FrameworkReference) />
61-
<ReferenceInclude=$(MsBuild_EngineReference) />
61+
<ReferenceInclude="$(MsBuild_FrameworkReference)" />
62+
<ReferenceInclude="$(MsBuild_EngineReference)" />
6263
<ReferenceInclude="EnvDTE.dll" />
6364
<ReferenceInclude="EnvDTE80.dll" />
6465
<ReferenceInclude="VSLangProj" />
6566
<ReferenceInclude="VSLangProj80" />
6667
<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop.dll" />
67-
<ReferenceInclude="$(VS_Shell_12_Reference)" />
68+
<ReferenceInclude="$(VS_Shell_Reference)" />
6869
<ReferenceInclude="Microsoft.VisualStudio.Threading" />
6970
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
7071
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />

0 commit comments

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