Skip to content

Commit 7115e44

Browse files
committed
Upgrade more stuff to v14 (VS 2015)
* This required upgrading to .net 4.6 * There is still an undocumented call that does not work (DefaultIconImageList.Instance). It has been commented out. * VsChromium runs fine in VS 2015 with this change (except custom icons are not displayed for known file extensions).
1 parent 0bdc64e commit 7115e44

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

src/Tests/Tests.csproj

+5-3
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@
1313
<FileAlignment>512</FileAlignment>
1414
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1515
<SignAssembly>false</SignAssembly>
16+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
17+
<TargetFrameworkProfile />
1618
</PropertyGroup>
1719
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
1820
<PlatformTarget>x64</PlatformTarget>
1921
</PropertyGroup>
2022
<ItemGroup>
21-
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
23+
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
2224
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
23-
<Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
24-
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
25+
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
26+
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
2527
<Reference Include="protobuf-net">
2628
<HintPath>$(BuildRoot)src\packages\protobuf-net.2.0.0.640\lib\net40\protobuf-net.dll</HintPath>
2729
</Reference>

src/VsChromium/Views/ImageSourceFactory.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ public Icon GetFileExtensionIcon(string fileExtension) {
7878
}
7979

8080
private KeyValuePair<string, ImageSource> GetImageSourceForFileExtension(string fileExtension) {
81+
// TODO: Fix this to work with v14 for VS SDK
82+
/*
8183
var list = DefaultIconImageList.Instance;
8284
ImageSource source = list.GetImage(fileExtension);
8385
if (source != null) {
@@ -88,8 +90,9 @@ private KeyValuePair<string, ImageSource> GetImageSourceForFileExtension(string
8890
if (source != null) {
8991
return new KeyValuePair<string, ImageSource>(".txt", source);
9092
}
93+
*/
9194

92-
source = GetImageSource("TextDocument");
95+
ImageSource source = GetImageSource("TextDocument");
9396
Invariants.CheckOperation(source != null, "Text Document icon is missing");
9497
return new KeyValuePair<string, ImageSource>("TextDocument", source);
9598
}

src/VsChromium/VsChromium.csproj

+8-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
77
<NuGetPackageImportStamp>
88
</NuGetPackageImportStamp>
9+
<TargetFrameworkProfile />
910
</PropertyGroup>
1011
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
1112
<DefineConstants>TRACE;PROFILE_SERVER2;</DefineConstants>
@@ -30,7 +31,7 @@
3031
<GeneratePkgDefFile>true</GeneratePkgDefFile>
3132
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
3233
<ZipPackageCompressionLevel>Normal</ZipPackageCompressionLevel>
33-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
34+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
3435
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
3536
<VsixType>v3</VsixType>
3637
</PropertyGroup>
@@ -76,6 +77,12 @@
7677
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0">
7778
<Private>False</Private>
7879
</Reference>
80+
<Reference Include="Microsoft.VisualStudio.Utilities">
81+
<Private>False</Private>
82+
</Reference>
83+
<Reference Include="Microsoft.VisualStudio.Imaging">
84+
<Private>False</Private>
85+
</Reference>
7986
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8087
<Private>False</Private>
8188
</Reference>

0 commit comments

Comments
 (0)