Skip to content

Commit d24486e

Browse files
author
Omar Tawfik
committed
Fixing Dev14 build errors
1 parent 8ba351d commit d24486e

File tree

15 files changed

+198
-89
lines changed

15 files changed

+198
-89
lines changed

‎packages.config‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@
77
<package id="NUnit.Console" version="3.0.0" targetFramework="net45" />
88
<package id="Microsoft.Composition" version="1.0.30" targetFramework="net46" />
99
<package id="System.Collections.Immutable" version="1.1.37" targetFramework="net46" />
10+
<package id="Microsoft.VisualStudio.Utilities" version="14.2.25123" targetFramework="net45" />
11+
<package id="Microsoft.VisualStudio.Threading" version="14.1.131" targetFramework="net45" />
12+
<package id="Microsoft.VisualStudio.Shell.Design" version="14.2.25123" targetFramework="net45" />
13+
<package id="Microsoft.VisualStudio.Text.UI" version="14.2.25123" targetFramework="net45" />
14+
<package id="Microsoft.VisualStudio.Text.UI.Wpf" version="14.2.25123" targetFramework="net45" />
15+
<package id="Microsoft.VisualStudio.Package.LanguageService.14.0" version="14.2.25123" targetFramework="net45" />
16+
<package id="Microsoft.VisualStudio.Text.Logic" version="14.2.25123" targetFramework="net45" />
17+
<package id="Microsoft.VisualStudio.CoreUtility" version="14.2.25123" targetFramework="net45" />
18+
<package id="Microsoft.VisualStudio.Text.Data" version="14.2.25123" targetFramework="net45" />
19+
<package id="Microsoft.VisualStudio.Editor" version="14.2.25123" targetFramework="net45" />
20+
<package id="Microsoft.VisualStudio.Language.StandardClassification" version="14.2.25123" targetFramework="net45" />
21+
<package id="Microsoft.VisualStudio.Shell.Immutable.14.0" version="14.2.25123" targetFramework="net45" />
1022
<package id="Microsoft.CodeAnalysis.Common" version="2.0.0-beta1" targetFramework="net46" />
1123
<package id="Microsoft.CodeAnalysis.EditorFeatures" version="2.0.0-beta1" targetFramework="net46" />
1224
<package id="Microsoft.CodeAnalysis.EditorFeatures.Text" version="2.0.0-beta1" targetFramework="net46" />

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,13 @@
3939
</ItemGroup>
4040
<ItemGroup>
4141
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
42-
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
43-
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition="'$(VisualStudioVersion)' != '12.0'" />
44-
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
42+
<Reference Include="Microsoft.VisualStudio.Shell.14.0" />
43+
<Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
44+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Utilities.14.2.25123\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
45+
</Reference>
46+
<Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
47+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
48+
</Reference>
4549
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
4650
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
4751
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -568,14 +568,18 @@
568568
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
569569
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
570570
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
571-
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
571+
<Reference Include="Microsoft.VisualStudio.Shell.14.0" />
572572
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
573573
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
574574
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />
575575
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />
576576
<Reference Include="Microsoft.VisualStudio.Shell.Interop.dll" />
577-
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
578-
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
577+
<Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
578+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
579+
</Reference>
580+
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
581+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Design.14.2.25123\lib\net45\Microsoft.VisualStudio.Shell.Design.dll</HintPath>
582+
</Reference>
579583
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
580584
<Reference Include="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
581585
<Reference Include="Microsoft.Build.Engine, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

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

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,11 @@
3232
<ItemGroup>
3333
<Compile Include="InternalsVisibleTo.fs" />
3434
<Compile Include="AssemblyInfo.fs" />
35-
<Compile Include="TokenContext.fs" />
3635
<Compile Include="SmartIndent.fs" />
3736
<Compile Include="FSharpProjectSiteService.fs" />
3837
<Compile Include="FSharpContentType.fs" />
3938
<Compile Include="FSharpColorizationService.fs" />
4039
<Compile Include="FSharpBraceMatchingService.fs" />
41-
<Content Include="extension.vsixmanifest">
42-
<CopyToOutputDirectory>false</CopyToOutputDirectory>
43-
</Content>
4440
</ItemGroup>
4541
<ItemGroup>
4642
<ProjectReference Include="..\..\..\src\fsharp\FSharp.Core\FSharp.Core.fsproj">
@@ -68,31 +64,44 @@
6864
<Reference Include="mscorlib" />
6965
<Reference Include="System" />
7066
<Reference Include="System.ComponentModel.Composition" />
71-
<Reference Include="Microsoft.VisualStudio.Editor" />
72-
<Reference Include="Microsoft.VisualStudio.Text.UI" />
73-
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf" />
74-
<Reference Include="Microsoft.VisualStudio.Text.Data" />
75-
<Reference Include="Microsoft.VisualStudio.Text.Logic" />
76-
<Reference Include="Microsoft.VisualStudio.CoreUtility" />
67+
<Reference Include="Microsoft.VisualStudio.Editor, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
68+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Editor.14.2.25123\lib\net45\Microsoft.VisualStudio.Editor.dll</HintPath>
69+
</Reference>
70+
<Reference Include="Microsoft.VisualStudio.Text.UI, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
71+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.14.2.25123\lib\net45\Microsoft.VisualStudio.Text.UI.dll</HintPath>
72+
</Reference>
73+
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
74+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Data.14.2.25123\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
75+
</Reference>
76+
<Reference Include="Microsoft.VisualStudio.Text.Logic, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
77+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Logic.14.2.25123\lib\net45\Microsoft.VisualStudio.Text.Logic.dll</HintPath>
78+
</Reference>
79+
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
80+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.CoreUtility.14.2.25123\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
81+
</Reference>
7782
<Reference Include="Microsoft.VisualStudio.OLE.Interop" />
78-
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
7983
<Reference Include="Microsoft.VisualStudio.Shell.Interop" />
8084
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
8185
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
8286
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
8387
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
8488
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
85-
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
86-
<Reference Include="Microsoft.VisualStudio.Utilities, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
87-
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
89+
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
90+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Design.14.2.25123\lib\net45\Microsoft.VisualStudio.Shell.Design.dll</HintPath>
91+
</Reference>
92+
<Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
93+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Utilities.14.2.25123\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
94+
</Reference>
95+
<Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
96+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
97+
</Reference>
8898
<Reference Include="Microsoft.VisualStudio.Shell.Interop.dll" />
8999
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
90100
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
91101
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />
92102
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />
93-
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
103+
<Reference Include="Microsoft.VisualStudio.Shell.14.0" />
94104
<Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
95-
<Reference Include="Microsoft.VisualStudio.Threading" />
96105
<Reference Include="PresentationCore" />
97106
<Reference Include="WindowsBase" />
98107
<Reference Include="System.Composition.AttributedModel">

‎vsintegration/src/FSharp.Editor/FSharpContentType.fs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22

33
namespace Microsoft.VisualStudio.FSharp.Editor
44

5-
open System.ComponentModel.Composition
6-
75
open Microsoft.CodeAnalysis.Editor
8-
open Microsoft.VisualStudio.Utilities
9-
106
open Microsoft.VisualStudio.FSharp.LanguageService
7+
open Microsoft.VisualStudio.Utilities
8+
open System.ComponentModel.Composition
9+
open System.Composition
1110

1211
module FSharpStaticTypeDefinitions =
1312
[<Export>]
14-
[<Name("F#")>]
13+
[<Name(FSharpCommonConstants.FSharpContentTypeName)>]
1514
[<BaseDefinition(ContentTypeNames.RoslynContentType)>]
1615
let FSharpContentTypeDefinition = ContentTypeDefinition()
1716

17+
[<Shared>]
1818
[<ExportContentTypeLanguageService(FSharpCommonConstants.FSharpContentTypeName, FSharpCommonConstants.FSharpLanguageName)>]
19-
type FSharpContentType [<System.Composition.ImportingConstructor>](contentTypeRegistry : IContentTypeRegistryService) =
19+
type internal FSharpContentTypeLanguageService [<ImportingConstructor>](contentTypeRegistry : IContentTypeRegistryService) =
2020
member this.contentTypeRegistryService = contentTypeRegistry
2121

2222
interface IContentTypeLanguageService with
2323
member this.GetDefaultContentType() =
24-
this.contentTypeRegistryService.GetContentType(FSharpCommonConstants.FSharpContentTypeName);
24+
this.contentTypeRegistryService.GetContentType(FSharpCommonConstants.FSharpContentTypeName);

‎vsintegration/src/FSharp.Editor/SmartIndent.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ type SmartIndent (textView : ITextView, textManager : IVsTextManager) =
9292
_textView <- null
9393

9494
[<Export(typeof<ISmartIndentProvider>)>]
95-
[<ContentType("F#")>]
95+
[<ContentType(FSharpCommonConstants.FSharpContentTypeName)>]
9696
type SmartIndentProvider [<ImportingConstructor>](serviceProvider : SVsServiceProvider) =
9797
interface ISmartIndentProvider with
9898

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

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,24 +76,36 @@
7676
<Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
7777
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
7878
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
79-
<Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
79+
<Reference Include="Microsoft.VisualStudio.Shell.14.0" />
8080
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
8181
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
8282
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />
8383
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />
8484
<Reference Include="Microsoft.VisualStudio.Shell.Interop.dll" />
85-
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
85+
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
86+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Design.14.2.25123\lib\net45\Microsoft.VisualStudio.Shell.Design.dll</HintPath>
87+
</Reference>
8688
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
8789
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
8890
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
8991
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
9092
<Reference Include="Microsoft.VisualStudio.VSHelp.dll" />
91-
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
92-
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
93-
<Reference Include="Microsoft.VisualStudio.Text.UI, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
94-
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
95-
<Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
96-
<Reference Include="Microsoft.VisualStudio.Editor, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
93+
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
94+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.CoreUtility.14.2.25123\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
95+
</Reference>
96+
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
97+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Data.14.2.25123\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
98+
</Reference>
99+
<Reference Include="Microsoft.VisualStudio.Text.UI, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
100+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.14.2.25123\lib\net45\Microsoft.VisualStudio.Text.UI.dll</HintPath>
101+
</Reference>
102+
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
103+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.14.2.25123\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
104+
</Reference>
105+
<Reference Include="Microsoft.VisualStudio.Editor, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
106+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Editor.14.2.25123\lib\net45\Microsoft.VisualStudio.Editor.dll</HintPath>
107+
</Reference>
108+
<Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
97109
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
98110
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
99111
<Name>FSharp.Core</Name>

0 commit comments

Comments
 (0)