Skip to content

Commit d25773b

Browse files
Added Visual Studio 2015 support
1 parent ec3e347 commit d25773b

File tree

5 files changed

+34
-5
lines changed

5 files changed

+34
-5
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
*.exe
44
*.pdb
55
*.suo
6-
*.csproj.user
76
*.mdf
87
*.ldf
98
bin/

FSharp.Interactive.Intellisense/FSharp.Interactive.Intellisense.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
5-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
4+
<MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
65
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
76
</PropertyGroup>
87
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -111,6 +110,11 @@
111110
<SubType>Component</SubType>
112111
</Compile>
113112
<Compile Include="Properties\AssemblyInfo.cs" />
113+
<Compile Include="Resources.Designer.cs">
114+
<AutoGen>True</AutoGen>
115+
<DesignTime>True</DesignTime>
116+
<DependentUpon>Resources.resx</DependentUpon>
117+
</Compile>
114118
</ItemGroup>
115119
<ItemGroup>
116120
<EmbeddedResource Include="Resources.resx">
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
4+
<StartAction>Program</StartAction>
5+
<StartProgram>C:\Program Files %28x86%29\Microsoft Visual Studio $(VisualStudioVersion)\Common7\IDE\devenv.exe</StartProgram>
6+
<StartArguments>/rootsuffix Exp</StartArguments>
7+
</PropertyGroup>
8+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
9+
<StartAction>Program</StartAction>
10+
<StartProgram>C:\Program Files %28x86%29\Microsoft Visual Studio $(VisualStudioVersion)\Common7\IDE\devenv.exe</StartProgram>
11+
<StartArguments>/rootsuffix Exp</StartArguments>
12+
</PropertyGroup>
13+
<PropertyGroup>
14+
<ProjectView>ShowAllFiles</ProjectView>
15+
<PublishUrlHistory />
16+
<InstallUrlHistory />
17+
<SupportUrlHistory />
18+
<UpdateUrlHistory />
19+
<BootstrapperUrlHistory />
20+
<ErrorReportUrlHistory />
21+
<FallbackCulture>en-US</FallbackCulture>
22+
<VerifyUploadedFiles>false</VerifyUploadedFiles>
23+
</PropertyGroup>
24+
</Project>

FSharp.Interactive.Intellisense/FsiLanguageServiceHelper.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ internal class FsiLanguageServiceHelper
2828

2929
public FsiLanguageServiceHelper()
3030
{
31-
fsiAssembly = Assembly.Load("FSharp.VS.FSI, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
31+
EnvDTE.DTE dte = (EnvDTE.DTE)Package.GetGlobalService(typeof(EnvDTE.DTE));
32+
fsiAssembly = Assembly.Load(String.Format("FSharp.VS.FSI, Version={0}.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", dte.Version));
3233
fsiLanguageServiceType = fsiAssembly.GetType("Microsoft.VisualStudio.FSharp.Interactive.FsiLanguageService");
3334
sessionsType = fsiAssembly.GetType("Microsoft.VisualStudio.FSharp.Interactive.Session.Sessions");
3435
fsiWindowType = fsiAssembly.GetType(FsiToolWindowClassName);

FSharp.Interactive.Intellisense/source.extension.vsixmanifest

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<Description xml:space="preserve">Basic intellisense support for F# Interactive</Description>
77
</Metadata>
88
<Installation>
9-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="12.0" />
9+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[12.0,15.0)" />
10+
<InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Enterprise" />
1011
</Installation>
1112
<Dependencies>
1213
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />

0 commit comments

Comments
 (0)