Skip to content

Commit b1eb1b7

Browse files
committed
Upgrade solution for ongoing development in Visual Studio 2017
1 parent 6e957c7 commit b1eb1b7

5 files changed

Lines changed: 24 additions & 15 deletions

File tree

StyleCop.Analyzers/StyleCop.Analyzers.Vsix/StyleCop.Analyzers.Vsix.csproj

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" />
34
<PropertyGroup>
4-
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
5-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
5+
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
66
</PropertyGroup>
77
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
88
<PropertyGroup>
@@ -65,6 +65,7 @@
6565
<None Include="..\StyleCop.Analyzers.ruleset">
6666
<Link>StyleCop.Analyzers.ruleset</Link>
6767
</None>
68+
<None Include="packages.config" />
6869
<None Include="source.extension.vsixmanifest">
6970
<SubType>Designer</SubType>
7071
</None>
@@ -80,7 +81,15 @@
8081
</ProjectReference>
8182
</ItemGroup>
8283
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
83-
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
84+
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets')" />
85+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
86+
<PropertyGroup>
87+
<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>
88+
</PropertyGroup>
89+
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props'))" />
90+
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets'))" />
91+
</Target>
92+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" />
8493
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8594
Other similar extension points exist, see Microsoft.Common.targets.
8695
<Target Name="BeforeBuild">
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.VSSDK.BuildTools" version="15.1.192" targetFramework="net45" developmentDependency="true" />
4+
</packages>

StyleCop.Analyzers/StyleCop.Analyzers.Vsix/source.extension.vsixmanifest

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66
<Description xml:space="preserve">An implementation of StyleCop's rules using Roslyn analyzers and code fixes</Description>
77
</Metadata>
88
<Installation>
9-
<InstallationTarget Version="[14.0,]" Id="Microsoft.VisualStudio.Pro" />
10-
<InstallationTarget Version="[14.0,]" Id="Microsoft.VisualStudio.VSWinDesktopExpress" />
11-
<InstallationTarget Version="[14.0,]" Id="Microsoft.VisualStudio.VWDExpress" />
12-
<InstallationTarget Version="[14.0,]" Id="Microsoft.VisualStudio.VSWinExpress" />
9+
<InstallationTarget Version="[14.0,]" Id="Microsoft.VisualStudio.Community" />
1310
</Installation>
14-
<Dependencies>
15-
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />
16-
</Dependencies>
11+
<Prerequisites>
12+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[14.0,16.0)" DisplayName="Visual Studio core editor" />
13+
<Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[14.0,16.0)" DisplayName="Roslyn Language Services" />
14+
</Prerequisites>
1715
<Assets>
1816
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="StyleCop.Analyzers" Path="|StyleCop.Analyzers|"/>
1917
<Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="StyleCop.Analyzers" Path="|StyleCop.Analyzers|"/>

StyleCopAnalyzers.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 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26430.14
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StyleCop.Analyzers", "StyleCop.Analyzers\StyleCop.Analyzers\StyleCop.Analyzers.csproj", "{3B052737-06CE-4182-AE0F-08EB82DFA73E}"
77
EndProject

appveyor.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
version: 1.0.{build}
2-
os: Visual Studio 2015
2+
image: Visual Studio 2017
33
init:
44
- git config --global core.autocrlf true
5-
install:
6-
- set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
75
before_build:
86
- nuget restore
97
build:

0 commit comments

Comments
 (0)