Skip to content

Commit 85ab2fc

Browse files
sharwellsharwell
committed
Merge pull request #1794 from sharwell/update-beta016
Update to StyleCop.Analyzers 1.0.0-beta016
2 parents 343d14a + 2fbefa5 commit 85ab2fc

8 files changed

Lines changed: 36 additions & 41 deletions

File tree

‎StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/StyleCop.Analyzers.CodeFixes.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,6 @@
147147
<None Include="..\StyleCop.Analyzers.ruleset">
148148
<Link>StyleCop.Analyzers.ruleset</Link>
149149
</None>
150-
<None Include="..\stylecop.json">
151-
<Link>stylecop.json</Link>
152-
</None>
153150
<None Include="packages.config" />
154151
<NuGetManifest Include="StyleCop.Analyzers.nuspec">
155152
<SubType>Designer</SubType>
@@ -160,6 +157,11 @@
160157
<None Include="tools\uninstall.ps1" />
161158
<None Include="ReadMe.txt" />
162159
</ItemGroup>
160+
<ItemGroup>
161+
<AdditionalFiles Include="..\stylecop.json">
162+
<Link>stylecop.json</Link>
163+
</AdditionalFiles>
164+
</ItemGroup>
163165
<ItemGroup>
164166
<Reference Include="Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
165167
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0\lib\portable-net45+win8\Microsoft.CodeAnalysis.dll</HintPath>
@@ -209,9 +211,9 @@
209211
<Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
210212
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
211213
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
212-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
213-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
214-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
214+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta016\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
215+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta016\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
216+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta016\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
215217
</ItemGroup>
216218
<ItemGroup>
217219
<ProjectReference Include="..\StyleCop.Analyzers\StyleCop.Analyzers.csproj">
@@ -226,10 +228,8 @@
226228
</PropertyGroup>
227229
<Error Condition="!Exists('..\..\packages\Tvl.NuGet.BuildTasks.1.0.0-alpha002\build\Tvl.NuGet.BuildTasks.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Tvl.NuGet.BuildTasks.1.0.0-alpha002\build\Tvl.NuGet.BuildTasks.props'))" />
228230
<Error Condition="!Exists('..\..\packages\Tvl.NuGet.BuildTasks.1.0.0-alpha002\build\Tvl.NuGet.BuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Tvl.NuGet.BuildTasks.1.0.0-alpha002\build\Tvl.NuGet.BuildTasks.targets'))" />
229-
<Error Condition="!Exists('..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets'))" />
230231
</Target>
231232
<Import Project="..\..\packages\Tvl.NuGet.BuildTasks.1.0.0-alpha002\build\Tvl.NuGet.BuildTasks.targets" Condition="Exists('..\..\packages\Tvl.NuGet.BuildTasks.1.0.0-alpha002\build\Tvl.NuGet.BuildTasks.targets')" />
232-
<Import Project="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets" Condition="Exists('..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets')" />
233233
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
234234
Other similar extension points exist, see Microsoft.Common.targets.
235235
<Target Name="BeforeBuild">

‎StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<package id="Microsoft.Composition" version="1.0.27" targetFramework="portable-net45+win8" />
1010
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="portable45-net45+win8" />
1111
<package id="NuGet.CommandLine" version="2.8.3" targetFramework="portable45-net45+win8" />
12-
<package id="StyleCop.Analyzers" version="1.0.0-beta015" targetFramework="portable45-net45+win8" developmentDependency="true" />
12+
<package id="StyleCop.Analyzers" version="1.0.0-beta016" targetFramework="portable45-net45+win8" developmentDependency="true" />
1313
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="portable45-net45+win8" />
1414
<package id="System.Reflection.Metadata" version="1.0.21" targetFramework="portable45-net45+win8" />
1515
<package id="Tvl.NuGet.BuildTasks" version="1.0.0-alpha002" targetFramework="portable45-net45+win8" />

‎StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -367,11 +367,13 @@
367367
<None Include="..\StyleCop.Analyzers.ruleset">
368368
<Link>StyleCop.Analyzers.ruleset</Link>
369369
</None>
370-
<None Include="..\stylecop.json">
371-
<Link>stylecop.json</Link>
372-
</None>
373370
<None Include="packages.config" />
374371
</ItemGroup>
372+
<ItemGroup>
373+
<AdditionalFiles Include="..\stylecop.json">
374+
<Link>stylecop.json</Link>
375+
</AdditionalFiles>
376+
</ItemGroup>
375377
<ItemGroup>
376378
<ProjectReference Include="..\StyleCop.Analyzers.CodeFixes\StyleCop.Analyzers.CodeFixes.csproj">
377379
<Project>{f91f7815-4e63-4698-b053-e57b2d707194}</Project>
@@ -386,9 +388,9 @@
386388
<Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
387389
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
388390
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
389-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
390-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
391-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
391+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta016\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
392+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta016\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
393+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta016\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
392394
</ItemGroup>
393395
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
394396
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -397,9 +399,7 @@
397399
</PropertyGroup>
398400
<Error Condition="!Exists('..\..\packages\xunit.core.2.1.0-beta4-build3109\build\portable-net45+netcore45+wp8+wpa81\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.1.0-beta4-build3109\build\portable-net45+netcore45+wp8+wpa81\xunit.core.props'))" />
399401
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props'))" />
400-
<Error Condition="!Exists('..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets'))" />
401402
</Target>
402-
<Import Project="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets" Condition="Exists('..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets')" />
403403
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
404404
Other similar extension points exist, see Microsoft.Common.targets.
405405
<Target Name="BeforeBuild">

‎StyleCop.Analyzers/StyleCop.Analyzers.Test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0" targetFramework="net452" />
99
<package id="Microsoft.Composition" version="1.0.27" targetFramework="net452" />
1010
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
11-
<package id="StyleCop.Analyzers" version="1.0.0-beta015" targetFramework="net452" developmentDependency="true" />
11+
<package id="StyleCop.Analyzers" version="1.0.0-beta016" targetFramework="net452" developmentDependency="true" />
1212
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net452" />
1313
<package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net452" />
1414
<package id="xunit" version="2.1.0-beta4-build3109" targetFramework="net452" />

‎StyleCop.Analyzers/StyleCop.Analyzers/StyleCop.Analyzers.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -332,12 +332,14 @@
332332
<None Include="..\StyleCop.Analyzers.ruleset">
333333
<Link>StyleCop.Analyzers.ruleset</Link>
334334
</None>
335-
<None Include="..\stylecop.json">
336-
<Link>stylecop.json</Link>
337-
</None>
338335
<None Include="packages.config" />
339336
<None Include="Settings\stylecop.schema.json" />
340337
</ItemGroup>
338+
<ItemGroup>
339+
<AdditionalFiles Include="..\stylecop.json">
340+
<Link>stylecop.json</Link>
341+
</AdditionalFiles>
342+
</ItemGroup>
341343
<ItemGroup>
342344
<Reference Include="Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
343345
<HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0\lib\portable-net45+win8\Microsoft.CodeAnalysis.dll</HintPath>
@@ -379,9 +381,9 @@
379381
<Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
380382
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
381383
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
382-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
383-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
384-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
384+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta016\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
385+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta016\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
386+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta016\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
385387
</ItemGroup>
386388
<ItemGroup>
387389
<EmbeddedResource Include="DocumentationRules\DocumentationResources.resx">
@@ -428,10 +430,8 @@
428430
</PropertyGroup>
429431
<Error Condition="!Exists('..\..\packages\Tvl.NuGet.BuildTasks.1.0.0-alpha002\build\Tvl.NuGet.BuildTasks.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Tvl.NuGet.BuildTasks.1.0.0-alpha002\build\Tvl.NuGet.BuildTasks.props'))" />
430432
<Error Condition="!Exists('..\..\packages\Tvl.NuGet.BuildTasks.1.0.0-alpha002\build\Tvl.NuGet.BuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Tvl.NuGet.BuildTasks.1.0.0-alpha002\build\Tvl.NuGet.BuildTasks.targets'))" />
431-
<Error Condition="!Exists('..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets'))" />
432433
</Target>
433434
<Import Project="..\..\packages\Tvl.NuGet.BuildTasks.1.0.0-alpha002\build\Tvl.NuGet.BuildTasks.targets" Condition="Exists('..\..\packages\Tvl.NuGet.BuildTasks.1.0.0-alpha002\build\Tvl.NuGet.BuildTasks.targets')" />
434-
<Import Project="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets" Condition="Exists('..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets')" />
435435
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
436436
Other similar extension points exist, see Microsoft.Common.targets.
437437
<Target Name="BeforeBuild">

‎StyleCop.Analyzers/StyleCop.Analyzers/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Composition" version="1.0.27" targetFramework="portable-net45+win8" />
88
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="portable45-net45+win8" />
99
<package id="NuGet.CommandLine" version="2.8.3" targetFramework="portable45-net45+win8" />
10-
<package id="StyleCop.Analyzers" version="1.0.0-beta015" targetFramework="portable45-net45+win8" developmentDependency="true" />
10+
<package id="StyleCop.Analyzers" version="1.0.0-beta016" targetFramework="portable45-net45+win8" developmentDependency="true" />
1111
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="portable45-net45+win8" />
1212
<package id="System.Reflection.Metadata" version="1.0.21" targetFramework="portable45-net45+win8" />
1313
<package id="Tvl.NuGet.BuildTasks" version="1.0.0-alpha002" targetFramework="portable45-net45+win8" />

‎StyleCop.Analyzers/StyleCopTester/StyleCopTester.csproj‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -133,19 +133,21 @@
133133
<None Include="..\StyleCop.Analyzers.ruleset">
134134
<Link>StyleCop.Analyzers.ruleset</Link>
135135
</None>
136-
<None Include="..\stylecop.json">
137-
<Link>stylecop.json</Link>
138-
</None>
139136
<None Include="App.config" />
140137
<None Include="packages.config" />
141138
</ItemGroup>
139+
<ItemGroup>
140+
<AdditionalFiles Include="..\stylecop.json">
141+
<Link>stylecop.json</Link>
142+
</AdditionalFiles>
143+
</ItemGroup>
142144
<ItemGroup>
143145
<Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
144146
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
145147
<Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
146-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
147-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
148-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
148+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta016\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
149+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta016\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
150+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta016\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
149151
</ItemGroup>
150152
<ItemGroup>
151153
<ProjectReference Include="..\StyleCop.Analyzers.CodeFixes\StyleCop.Analyzers.CodeFixes.csproj">
@@ -158,13 +160,6 @@
158160
</ProjectReference>
159161
</ItemGroup>
160162
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
161-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
162-
<PropertyGroup>
163-
<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>
164-
</PropertyGroup>
165-
<Error Condition="!Exists('..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets'))" />
166-
</Target>
167-
<Import Project="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets" Condition="Exists('..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets')" />
168163
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
169164
Other similar extension points exist, see Microsoft.Common.targets.
170165
<Target Name="BeforeBuild">

‎StyleCop.Analyzers/StyleCopTester/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="1.0.0" targetFramework="net45" />
1010
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />
12-
<package id="StyleCop.Analyzers" version="1.0.0-beta015" targetFramework="net452" developmentDependency="true" />
12+
<package id="StyleCop.Analyzers" version="1.0.0-beta016" targetFramework="net452" developmentDependency="true" />
1313
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
1414
<package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
1515
</packages>

0 commit comments

Comments
 (0)