Skip to content

Commit d5f2024

Browse files
sharwellsharwell
authored
Merge pull request #14 from sharwell/use-cps
Update to the new project system
2 parents ec8eb8e + f0c4b1e commit d5f2024

File tree

6 files changed

+45
-138
lines changed

6 files changed

+45
-138
lines changed

‎.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
# Per-user files
22
*.csproj.user
3-
*.suo
43

54
# Temporary files created by the IDE
6-
*.sln.ide/
7-
8-
# NuGet packages
9-
packages/
5+
.vs/
106

117
# Build output
128
bin/

‎MouseFastScroll.sln

Lines changed: 6 additions & 3 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 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27428.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
@@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1010
README.md = README.md
1111
EndProjectSection
1212
EndProject
13-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tvl.VisualStudio.MouseFastScroll", "Tvl.VisualStudio.MouseFastScroll\Tvl.VisualStudio.MouseFastScroll.csproj", "{7DFA0DD1-8052-464D-9A1A-5EADC10A84B0}"
13+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tvl.VisualStudio.MouseFastScroll", "Tvl.VisualStudio.MouseFastScroll\Tvl.VisualStudio.MouseFastScroll.csproj", "{7DFA0DD1-8052-464D-9A1A-5EADC10A84B0}"
1414
EndProject
1515
Global
1616
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,4 +26,7 @@ Global
2626
GlobalSection(SolutionProperties) = preSolution
2727
HideSolutionNode = FALSE
2828
EndGlobalSection
29+
GlobalSection(ExtensibilityGlobals) = postSolution
30+
SolutionGuid = {03FE809E-E84A-4B12-9FCF-D50C52F1AEA6}
31+
EndGlobalSection
2932
EndGlobal

‎Tvl.VisualStudio.MouseFastScroll/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,14 @@
22
// Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
33

44
using System;
5-
using System.Reflection;
65
using System.Runtime.InteropServices;
76

87
// General Information about an assembly is controlled through the following
98
// set of attributes. Change these attribute values to modify the information
109
// associated with an assembly.
11-
[assembly: AssemblyTitle("Tvl.VisualStudio.MouseFastScroll")]
12-
[assembly: AssemblyDescription("")]
13-
[assembly: AssemblyConfiguration("")]
14-
[assembly: AssemblyCompany("Tunnel Vision Laboratories, LLC")]
15-
[assembly: AssemblyProduct("Tvl.VisualStudio.MouseFastScroll")]
16-
[assembly: AssemblyCopyright("Copyright © Sam Harwell 2014")]
17-
[assembly: AssemblyTrademark("")]
18-
[assembly: AssemblyCulture("")]
1910
[assembly: CLSCompliant(false)]
2011

2112
// Setting ComVisible to false makes the types in this assembly not visible
2213
// to COM components. If you need to access a type in this assembly from
2314
// COM, set the ComVisible attribute to true on that type.
2415
[assembly: ComVisible(false)]
25-
26-
// Version information for an assembly consists of the following four values:
27-
//
28-
// Major Version
29-
// Minor Version
30-
// Build Number
31-
// Revision
32-
//
33-
// You can specify all the values or you can default the Build and Revision Numbers
34-
// by using the '*' as shown below:
35-
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("4.2.0.0")]
37-
[assembly: AssemblyFileVersion("4.2.0.0")]
38-
[assembly: AssemblyInformationalVersion("4.2.0-dev")]

‎Tvl.VisualStudio.MouseFastScroll/Properties/launchSettings.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"profiles": {
3+
"Visual Studio Extension": {
4+
"executablePath": "$(DevEnvDir)devenv.exe",
5+
"commandLineArgs": "/rootsuffix $(VSSDKTargetPlatformRegRootSuffix) /log"
6+
}
7+
}
8+
}

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

Lines changed: 29 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,58 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<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')" />
4-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2+
<Project>
3+
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
4+
5+
<PropertyGroup>
6+
<TargetFramework>net45</TargetFramework>
7+
8+
<Description>Mouse Fast Scroll extension for Visual Studio</Description>
9+
<Company>Tunnel Vision Laboratories, LLC</Company>
10+
<Copyright>Copyright © Sam Harwell 2014</Copyright>
11+
<Version>4.2.0.0</Version>
12+
<FileVersion>4.2.0.0</FileVersion>
13+
<InformationalVersion>4.2.0-dev</InformationalVersion>
14+
</PropertyGroup>
15+
516
<PropertyGroup>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProductVersion>8.0.30703</ProductVersion>
9-
<SchemaVersion>2.0</SchemaVersion>
10-
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
11-
<ProjectGuid>{7DFA0DD1-8052-464D-9A1A-5EADC10A84B0}</ProjectGuid>
12-
<OutputType>Library</OutputType>
13-
<AppDesignerFolder>Properties</AppDesignerFolder>
14-
<RootNamespace>Tvl.VisualStudio.MouseFastScroll</RootNamespace>
15-
<AssemblyName>Tvl.VisualStudio.MouseFastScroll</AssemblyName>
16-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
17-
<FileAlignment>512</FileAlignment>
1817
<GeneratePkgDefFile>false</GeneratePkgDefFile>
1918
<UseCodebase>true</UseCodebase>
2019
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
2120
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
2221
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
2322
<CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
2423
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
25-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
26-
<VsixType>v3</VsixType>
27-
</PropertyGroup>
28-
<PropertyGroup>
29-
<!-- Common debugging support -->
30-
<StartAction>Program</StartAction>
31-
<StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
32-
<StartArguments>/rootSuffix Exp</StartArguments>
33-
</PropertyGroup>
34-
<PropertyGroup Condition="'$(VisualStudioVersion)' != ''">
35-
<!-- This is added to prevent forced migrations in Visual Studio 2012 and newer -->
36-
<MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
3724
</PropertyGroup>
25+
3826
<PropertyGroup Condition="'$(BuildingInsideVisualStudio)' != 'true'">
3927
<!-- This property disables extension deployment for command line builds; required for AppVeyor -->
4028
<DeployExtension>False</DeployExtension>
4129
</PropertyGroup>
42-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
30+
31+
<PropertyGroup>
4332
<DebugSymbols>true</DebugSymbols>
44-
<DebugType>full</DebugType>
45-
<Optimize>false</Optimize>
46-
<OutputPath>bin\Debug\</OutputPath>
47-
<DefineConstants>DEBUG;TRACE</DefineConstants>
48-
<ErrorReport>prompt</ErrorReport>
49-
<WarningLevel>4</WarningLevel>
50-
</PropertyGroup>
51-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
52-
<DebugType>pdbonly</DebugType>
53-
<Optimize>true</Optimize>
54-
<OutputPath>bin\Release\</OutputPath>
55-
<DefineConstants>TRACE</DefineConstants>
56-
<ErrorReport>prompt</ErrorReport>
57-
<WarningLevel>4</WarningLevel>
33+
<DebugType>portable</DebugType>
5834
</PropertyGroup>
35+
5936
<ItemGroup>
60-
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
61-
<Private>False</Private>
62-
<HintPath>..\packages\VSSDK.CoreUtility.11.0.4\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
63-
</Reference>
64-
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
65-
<Private>False</Private>
66-
<HintPath>..\packages\VSSDK.Text.11.0.4\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
67-
</Reference>
68-
<Reference Include="Microsoft.VisualStudio.Text.Logic, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
69-
<Private>False</Private>
70-
<HintPath>..\packages\VSSDK.Text.11.0.4\lib\net45\Microsoft.VisualStudio.Text.Logic.dll</HintPath>
71-
</Reference>
72-
<Reference Include="Microsoft.VisualStudio.Text.UI, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
73-
<Private>False</Private>
74-
<HintPath>..\packages\VSSDK.Text.11.0.4\lib\net45\Microsoft.VisualStudio.Text.UI.dll</HintPath>
75-
</Reference>
76-
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
77-
<Private>False</Private>
78-
<HintPath>..\packages\VSSDK.Text.11.0.4\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
79-
</Reference>
80-
<Reference Include="PresentationCore" />
81-
<Reference Include="PresentationFramework" />
82-
<Reference Include="System" />
83-
<Reference Include="System.ComponentModel.Composition" />
84-
<Reference Include="System.Core" />
85-
<Reference Include="System.Xml.Linq" />
86-
<Reference Include="System.Data.DataSetExtensions" />
87-
<Reference Include="Microsoft.CSharp" />
88-
<Reference Include="System.Data" />
89-
<Reference Include="System.Xml" />
90-
<Reference Include="WindowsBase" />
91-
</ItemGroup>
92-
<ItemGroup>
93-
<Compile Include="FastScrollProcessor.cs" />
94-
<Compile Include="FastScrollProvider.cs" />
95-
<Compile Include="Properties\AssemblyInfo.cs" />
96-
</ItemGroup>
97-
<ItemGroup>
98-
<None Include="packages.config" />
99-
<None Include="SharedKey.snk" />
100-
<None Include="source.extension.vsixmanifest">
101-
<SubType>Designer</SubType>
102-
</None>
37+
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.1.192" PrivateAssets="all" />
38+
<PackageReference Include="VSSDK.CoreUtility" Version="11.0.4" />
39+
<PackageReference Include="VSSDK.Text" Version="11.0.4" />
10340
</ItemGroup>
41+
10442
<ItemGroup>
10543
<Content Include="..\LICENSE.txt">
10644
<Link>LICENSE.txt</Link>
10745
<IncludeInVSIX>true</IncludeInVSIX>
10846
</Content>
10947
</ItemGroup>
48+
11049
<PropertyGroup>
11150
<SignAssembly>true</SignAssembly>
112-
</PropertyGroup>
113-
<PropertyGroup>
11451
<AssemblyOriginatorKeyFile>SharedKey.snk</AssemblyOriginatorKeyFile>
11552
</PropertyGroup>
116-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
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')" />
126-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
127-
Other similar extension points exist, see Microsoft.Common.targets.
128-
<Target Name="BeforeBuild">
129-
</Target>
130-
<Target Name="AfterBuild">
131-
</Target>
132-
-->
53+
54+
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
55+
56+
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets')" />
57+
13358
</Project>

‎appveyor.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: 1.0.{build}
2-
image: Visual Studio 2015
2+
image: Visual Studio 2017
33
configuration: Release
44
platform: Any CPU
55
init:
@@ -11,5 +11,3 @@ build:
1111
test: off
1212
artifacts:
1313
- path: '**\*.vsix'
14-
cache:
15-
- packages -> **\packages.config

0 commit comments

Comments
 (0)