Skip to content

Commit f9e00f1

Browse files
authored
Merge pull request #7 from sharwell/support-2017
Update to support Visual Studio 2017
2 parents 0d96737 + 030ed24 commit f9e00f1

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

MouseFastScroll.sln

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30723.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7939456F-2CC6-4242-96AB-E1C8D75C0D79}"
77
ProjectSection(SolutionItems) = preProject

Tvl.VisualStudio.MouseFastScroll/Tvl.VisualStudio.MouseFastScroll.csproj

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props" Condition="Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -22,18 +23,14 @@
2223
<CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
2324
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
2425
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
26+
<VsixType>v3</VsixType>
2527
</PropertyGroup>
2628
<PropertyGroup>
2729
<!-- Common debugging support -->
2830
<StartAction>Program</StartAction>
2931
<StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
3032
<StartArguments>/rootSuffix Exp</StartArguments>
3133
</PropertyGroup>
32-
<PropertyGroup>
33-
<!-- Use the SDK for the current version of Visual Studio -->
34-
<VsSdkTargets Condition="'$(VisualStudioVersion)'!=''">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK\Microsoft.VsSDK.targets</VsSdkTargets>
35-
<VsSdkTargets Condition="'$(VisualStudioVersion)'==''">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets</VsSdkTargets>
36-
</PropertyGroup>
3734
<PropertyGroup Condition="'$(VisualStudioVersion)' != ''">
3835
<!-- This is added to prevent forced migrations in Visual Studio 2012 and newer -->
3936
<MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
@@ -117,7 +114,15 @@
117114
<AssemblyOriginatorKeyFile>SharedKey.snk</AssemblyOriginatorKeyFile>
118115
</PropertyGroup>
119116
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
120-
<Import Condition="Exists($(VsSdkTargets))" Project="$(VsSdkTargets)" />
117+
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
118+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
119+
<PropertyGroup>
120+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
121+
</PropertyGroup>
122+
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props'))" />
123+
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets'))" />
124+
</Target>
125+
<Import Project="..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" />
121126
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
122127
Other similar extension points exist, see Microsoft.Common.targets.
123128
<Target Name="BeforeBuild">

Tvl.VisualStudio.MouseFastScroll/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Microsoft.VisualStudio.Sdk.BuildTasks.14.0" version="14.0.12-pre" targetFramework="net45" developmentDependency="true" />
34
<package id="VSSDK.CoreUtility" version="11.0.4" targetFramework="net45" />
45
<package id="VSSDK.CoreUtility.11" version="11.0.4" targetFramework="net45" />
56
<package id="VSSDK.IDE.10" version="10.0.4" targetFramework="net45" />

Tvl.VisualStudio.MouseFastScroll/source.extension.vsixmanifest

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
<Tags>mouse, scroll, zoom</Tags>
1515
</Metadata>
1616
<Installation>
17-
<InstallationTarget Version="[11.0,15.0)" Id="Microsoft.VisualStudio.Community" />
17+
<InstallationTarget Version="[11.0,16.0)" Id="Microsoft.VisualStudio.Community" />
1818
</Installation>
19+
<Prerequisites>
20+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
21+
</Prerequisites>
1922
<Assets>
2023
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
2124
</Assets>

0 commit comments

Comments
 (0)