Skip to content

Commit 36ee5a7

Browse files
sharwellsharwell
committed
Update StyleCopTester to the new project system
1 parent e72ef23 commit 36ee5a7

6 files changed

Lines changed: 31 additions & 208 deletions

File tree

‎StyleCop.Analyzers/Directory.build.props‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Description>An implementation of StyleCop rules using the .NET Compiler Platform</Description>
66
<Product>StyleCop.Analyzers</Product>
77
<Company>Tunnel Vision Laboratories, LLC</Company>
8-
<Copyright>Copyright © Sam Harwell 2015</Copyright>
8+
<Copyright>Copyright © Tunnel Vision Laboratories, LLC 2015</Copyright>
99
</PropertyGroup>
1010

1111
<PropertyGroup>
@@ -50,12 +50,10 @@
5050
</ItemGroup>
5151

5252
<ItemGroup>
53-
<None Include="$(MSBuildThisFileDirectory)StyleCop.Analyzers.Internal.ruleset">
54-
<Link>StyleCop.Analyzers.Internal.ruleset</Link>
55-
</None>
56-
<None Include="$(MSBuildThisFileDirectory)StyleCop.Analyzers.ruleset">
57-
<Link>StyleCop.Analyzers.ruleset</Link>
58-
</None>
53+
<None Include="$(MSBuildThisFileDirectory)*.ruleset" Link="%(Filename)%(Extension)" />
54+
55+
<!-- Show launchSettings.json in the project if it exists. -->
56+
<None Include="$(AppDesignerFolder)\launchSettings.json" Condition="Exists('$(AppDesignerFolder)\launchSettings.json')" />
5957
</ItemGroup>
6058

6159
<ItemGroup>

‎StyleCop.Analyzers/StyleCopTester/Properties/AssemblyInfo.cs‎

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

44
using System;
5-
using System.Reflection;
6-
using System.Resources;
75
using System.Runtime.InteropServices;
86

9-
// General Information about an assembly is controlled through the following
10-
// set of attributes. Change these attribute values to modify the information
11-
// associated with an assembly.
12-
[assembly: AssemblyTitle("StyleCopTester")]
13-
[assembly: AssemblyDescription("")]
14-
[assembly: AssemblyConfiguration("")]
15-
[assembly: AssemblyCompany("Tunnel Vision Laboratories, LLC")]
16-
[assembly: AssemblyProduct("StyleCop.Analyzers")]
17-
[assembly: AssemblyCopyright("Copyright © Tunnel Vision Laboratories, LLC 2015")]
18-
[assembly: AssemblyTrademark("")]
19-
[assembly: AssemblyCulture("")]
207
[assembly: CLSCompliant(false)]
21-
[assembly: NeutralResourcesLanguage("en-US")]
228

239
// Setting ComVisible to false makes the types in this assembly not visible
2410
// to COM components. If you need to access a type in this assembly from
@@ -27,17 +13,3 @@
2713

2814
// The following GUID is for the ID of the typelib if this project is exposed to COM
2915
[assembly: Guid("c4b7092c-e1a9-4cf7-ae4c-d6a146392ba7")]
30-
31-
// Version information for an assembly consists of the following four values:
32-
//
33-
// Major Version
34-
// Minor Version
35-
// Build Number
36-
// Revision
37-
//
38-
// You can specify all the values or you can default the Build and Revision Numbers
39-
// by using the '*' as shown below:
40-
// [assembly: AssemblyVersion("1.0.*")]
41-
[assembly: AssemblyVersion("1.0.0.0")]
42-
[assembly: AssemblyFileVersion("1.0.0.0")]
43-
[assembly: AssemblyInformationalVersion("1.0.0.0-dev")]

‎StyleCop.Analyzers/StyleCopTester/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+
"StyleCopAnalyzers.sln /stats": {
4+
"commandLineArgs": "..\\..\\StyleCopAnalyzers.sln /stats",
5+
"workingDirectory": "$(MSBuildProjectDirectory)"
6+
}
7+
}
8+
}

‎StyleCop.Analyzers/StyleCopTester/StyleCopTester.csproj‎

Lines changed: 17 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -1,170 +1,38 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2+
<Project Sdk="Microsoft.NET.Sdk">
3+
44
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{C4B7092C-E1A9-4CF7-AE4C-D6A146392BA7}</ProjectGuid>
85
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>StyleCopTester</RootNamespace>
11-
<AssemblyName>StyleCopTester</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<PlatformTarget>AnyCPU</PlatformTarget>
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
<Prefer32Bit>false</Prefer32Bit>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
</PropertyGroup>
35-
<PropertyGroup Condition="'$(BuildingInsideVisualStudio)' != 'true'">
36-
<!-- Ideally this is always enabled, but that tends to hurt developer productivity -->
37-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
6+
<TargetFrameworks>net452</TargetFrameworks>
7+
8+
<NeutralLanguage>en-US</NeutralLanguage>
9+
<InformationalVersion>1.0.0-dev</InformationalVersion>
3810
</PropertyGroup>
11+
3912
<PropertyGroup>
40-
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
4113
<CodeAnalysisRuleSet>..\StyleCop.Analyzers.Internal.ruleset</CodeAnalysisRuleSet>
4214
</PropertyGroup>
43-
<PropertyGroup>
44-
<StartArguments>..\..\StyleCopAnalyzers.sln /stats</StartArguments>
45-
<StartWorkingDirectory>$(MSBuildProjectDirectory)</StartWorkingDirectory>
46-
</PropertyGroup>
15+
4716
<PropertyGroup>
4817
<SignAssembly>true</SignAssembly>
4918
<AssemblyOriginatorKeyFile>..\..\build\keys\TestingKey.snk</AssemblyOriginatorKeyFile>
5019
</PropertyGroup>
20+
5121
<ItemGroup>
52-
<Reference Include="Microsoft.CodeAnalysis, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.2.1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
54-
<Private>True</Private>
55-
</Reference>
56-
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.1.2.1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
58-
<Private>True</Private>
59-
</Reference>
60-
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.2.1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
62-
<Private>True</Private>
63-
</Reference>
64-
<Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.VisualBasic.1.2.1\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
66-
<Private>True</Private>
67-
</Reference>
68-
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.2.1\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
70-
<Private>True</Private>
71-
</Reference>
72-
<Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
73-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
74-
<Private>True</Private>
75-
</Reference>
76-
<Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
78-
<Private>True</Private>
79-
</Reference>
80-
<Reference Include="System" />
81-
<Reference Include="System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
82-
<HintPath>..\..\packages\System.Collections.Immutable.1.1.37\lib\dotnet\System.Collections.Immutable.dll</HintPath>
83-
<Private>True</Private>
84-
</Reference>
85-
<Reference Include="System.Composition.AttributedModel, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
86-
<HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
87-
<Private>True</Private>
88-
</Reference>
89-
<Reference Include="System.Composition.Convention, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
90-
<HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
91-
<Private>True</Private>
92-
</Reference>
93-
<Reference Include="System.Composition.Hosting, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94-
<HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
95-
<Private>True</Private>
96-
</Reference>
97-
<Reference Include="System.Composition.Runtime, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
98-
<HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
99-
<Private>True</Private>
100-
</Reference>
101-
<Reference Include="System.Composition.TypedParts, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
102-
<HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
103-
<Private>True</Private>
104-
</Reference>
105-
<Reference Include="System.Core" />
106-
<Reference Include="System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
107-
<HintPath>..\..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
108-
<Private>True</Private>
109-
</Reference>
110-
<Reference Include="System.Xml.Linq" />
111-
<Reference Include="System.Data.DataSetExtensions" />
112-
<Reference Include="Microsoft.CSharp" />
113-
<Reference Include="System.Data" />
114-
<Reference Include="System.Net.Http" />
115-
<Reference Include="System.Xml" />
11622
<Reference Include="WindowsBase" />
11723
</ItemGroup>
24+
11825
<ItemGroup>
119-
<Compile Include="CodeFixEquivalenceGroup.cs" />
120-
<Compile Include="Extensions.cs" />
121-
<Compile Include="Program.cs" />
122-
<Compile Include="Properties\AssemblyInfo.cs" />
123-
<Compile Include="Statistic.cs" />
124-
<Compile Include="TesterDiagnosticProvider.cs" />
26+
<PackageReference Include="Microsoft.CodeAnalysis" Version="1.2.1" />
12527
</ItemGroup>
28+
12629
<ItemGroup>
127-
<None Include="..\..\build\keys\TestingKey.snk">
128-
<Link>TestingKey.snk</Link>
129-
</None>
130-
<None Include="..\StyleCop.Analyzers.Internal.ruleset">
131-
<Link>StyleCop.Analyzers.Internal.ruleset</Link>
132-
</None>
133-
<None Include="..\StyleCop.Analyzers.ruleset">
134-
<Link>StyleCop.Analyzers.ruleset</Link>
135-
</None>
136-
<None Include="App.config" />
137-
<None Include="packages.config" />
30+
<ProjectReference Include="..\StyleCop.Analyzers.CodeFixes\StyleCop.Analyzers.CodeFixes.csproj" />
31+
<ProjectReference Include="..\StyleCop.Analyzers\StyleCop.Analyzers.csproj" />
13832
</ItemGroup>
33+
13934
<ItemGroup>
140-
<AdditionalFiles Include="..\stylecop.json">
141-
<Link>stylecop.json</Link>
142-
</AdditionalFiles>
143-
</ItemGroup>
144-
<ItemGroup>
145-
<Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
146-
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.2.0-beta2\analyzers\dotnet\cs\Analyzer.Utilities.dll" />
147-
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.2.0-beta2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
148-
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.2.0-beta2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
149-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta004\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
150-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta004\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
151-
</ItemGroup>
152-
<ItemGroup>
153-
<ProjectReference Include="..\StyleCop.Analyzers.CodeFixes\StyleCop.Analyzers.CodeFixes.csproj">
154-
<Project>{f91f7815-4e63-4698-b053-e57b2d707194}</Project>
155-
<Name>StyleCop.Analyzers.CodeFixes</Name>
156-
</ProjectReference>
157-
<ProjectReference Include="..\StyleCop.Analyzers\StyleCop.Analyzers.csproj">
158-
<Project>{3b052737-06ce-4182-ae0f-08eb82dfa73e}</Project>
159-
<Name>StyleCop.Analyzers</Name>
160-
</ProjectReference>
35+
<None Include="App.config" />
16136
</ItemGroup>
162-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
163-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
164-
Other similar extension points exist, see Microsoft.Common.targets.
165-
<Target Name="BeforeBuild">
166-
</Target>
167-
<Target Name="AfterBuild">
168-
</Target>
169-
-->
37+
17038
</Project>

‎StyleCop.Analyzers/StyleCopTester/packages.config‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎StyleCopAnalyzers.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "documentation", "documentat
243243
documentation\SX1309S.md = documentation\SX1309S.md
244244
EndProjectSection
245245
EndProject
246-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StyleCopTester", "StyleCop.Analyzers\StyleCopTester\StyleCopTester.csproj", "{C4B7092C-E1A9-4CF7-AE4C-D6A146392BA7}"
246+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StyleCopTester", "StyleCop.Analyzers\StyleCopTester\StyleCopTester.csproj", "{C4B7092C-E1A9-4CF7-AE4C-D6A146392BA7}"
247247
EndProject
248248
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StyleCop.Analyzers.CodeFixes", "StyleCop.Analyzers\StyleCop.Analyzers.CodeFixes\StyleCop.Analyzers.CodeFixes.csproj", "{F91F7815-4E63-4698-B053-E57B2D707194}"
249249
EndProject

0 commit comments

Comments
 (0)