Skip to content

Commit c2e21b2

Browse files
author
Omar Tawfik
committed
Enable Roslyn build on dev15 Preview 4
1 parent b573128 commit c2e21b2

File tree

8 files changed

+22
-8
lines changed

8 files changed

+22
-8
lines changed

‎packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<package id="Microsoft.VisualStudio.Shell.Design" version="14.3.25407" targetFramework="net46" />
3636
<package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net46" />
3737
<package id="Microsoft.VisualStudio.Language.StandardClassification" version="14.3.25407" targetFramework="net46" />
38+
<package id="Microsoft.VisualStudio.Designer.Interfaces" version="1.1.4322" />
3839
<package id="Roslyn.Microsoft.VisualStudio.ComponentModelHost" version="0.0.2" targetFramework="net46" />
3940
<package id="Microsoft.VisualFSharp.Microsoft.VisualStudio.Shell.UI.Internal" version="14.0.25420" targetFramework="net46" />
4041
<package id="RoslynDependencies.Microsoft.VisualStudio.Text.Internal" version="14.3.25407" targetFramework="net45" />

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@
8787
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
8888
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
8989
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
90-
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
90+
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces">
91+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Designer.Interfaces.1.1.4322\lib\microsoft.visualstudio.designer.interfaces.dll</HintPath>
92+
</Reference>
9193
<Reference Include="Microsoft.VisualStudio.VSHelp.dll" />
9294
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
9395
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@
9393
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
9494
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
9595
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
96-
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
96+
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces">
97+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Designer.Interfaces.1.1.4322\lib\microsoft.visualstudio.designer.interfaces.dll</HintPath>
98+
</Reference>
9799
<Reference Include="PresentationFramework" />
98100
<Reference Include="PresentationCore" />
99101
<Reference Include="WindowsBase" />

‎vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@
101101
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
102102
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
103103
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
104-
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
104+
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces">
105+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Designer.Interfaces.1.1.4322\lib\microsoft.visualstudio.designer.interfaces.dll</HintPath>
106+
</Reference>
105107
<Reference Include="Microsoft.VisualStudio.VSHelp.dll" />
106108
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
107109
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Design.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Design.dll</HintPath>

‎vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@
7979
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
8080
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
8181
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
82-
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
82+
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces">
83+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Designer.Interfaces.1.1.4322\lib\microsoft.visualstudio.designer.interfaces.dll</HintPath>
84+
</Reference>
8385
<Reference Include="Microsoft.VisualStudio.VSHelp.dll" />
8486
<Reference Include="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
8587
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll</HintPath>
@@ -94,7 +96,6 @@
9496
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Tasks.Core.dll</HintPath>
9597
</Reference>
9698
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.$(RoslynVSBinariesVersion)" />
97-
<Reference Include="Microsoft.VisualStudio.Shell.Framework" />
9899
<Reference Include="System" />
99100
<Reference Include="System.Core" />
100101
<Reference Include="System.Design" />

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@
7979
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
8080
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
8181
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.10.0.dll" />
82-
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
82+
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces">
83+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Designer.Interfaces.1.1.4322\lib\microsoft.visualstudio.designer.interfaces.dll</HintPath>
84+
</Reference>
8385
<Reference Include="Microsoft.VisualStudio.VSHelp.dll" />
8486
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
8587
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>

‎vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@
6262
<Reference Include="Microsoft.VisualStudio.ProjectAggregator" />
6363
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
6464
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
65-
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
65+
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces">
66+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Designer.Interfaces.1.1.4322\lib\microsoft.visualstudio.designer.interfaces.dll</HintPath>
67+
</Reference>
6668
<Reference Include="Microsoft.VisualStudio.CommonIDE" />
6769
<Reference Include="Microsoft.VisualStudio.Text.Internal, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
6870
<HintPath>$(FSharpSourcesRoot)\..\packages\RoslynDependencies.Microsoft.VisualStudio.Text.Internal.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.Internal.dll</HintPath>

‎vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,9 @@
159159
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
160160
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
161161
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
162-
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
162+
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces">
163+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Designer.Interfaces.1.1.4322\lib\microsoft.visualstudio.designer.interfaces.dll</HintPath>
164+
</Reference>
163165
<Reference Include="Microsoft.VisualStudio.CommonIDE" />
164166
<Reference Include="Microsoft.VisualStudio.VSHelp.dll" />
165167
<Reference Include="nunit.framework">

0 commit comments

Comments
 (0)