Merge pull request #2414 from sharwell/update-stylecop

sharwell · web-flow · commit 84e7e8bc6be4 · 2017-06-16T17:23:33.000-05:00
Update to use release 1.1.0-beta003
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/StyleCop.Analyzers.CodeFixes.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/StyleCop.Analyzers.CodeFixes.csproj
@@ -220,9 +220,8 @@
     <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta003\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta003\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\StyleCop.Analyzers\StyleCop.Analyzers.csproj">
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/packages.config b/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/packages.config
@@ -8,7 +8,7 @@
   <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.2.1" targetFramework="portable45-net45+win8" />
   <package id="Microsoft.Composition" version="1.0.27" targetFramework="portable-net45+win8" />
   <package id="NuGet.CommandLine" version="2.8.3" targetFramework="portable45-net45+win8" />
-  <package id="StyleCop.Analyzers" version="1.1.0-beta001" targetFramework="portable45-net45+win8" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.1.0-beta003" targetFramework="portable45-net45+win8" developmentDependency="true" />
   <package id="System.Collections.Immutable" version="1.1.37" targetFramework="portable45-net45+win8" />
   <package id="System.Reflection.Metadata" version="1.2.0" targetFramework="portable45-net45+win8" />
   <package id="Tvl.NuGet.BuildTasks" version="1.0.0-alpha002" targetFramework="portable45-net45+win8" />
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/StyleCop.Analyzers.Test.CSharp7.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/StyleCop.Analyzers.Test.CSharp7.csproj
@@ -456,9 +456,8 @@
     <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta003\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta003\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/packages.config b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/packages.config
@@ -9,7 +9,7 @@
   <package id="Microsoft.CodeAnalysis.Elfie" version="0.10.6" targetFramework="net46" />
   <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="2.1.0" targetFramework="net46" />
   <package id="Microsoft.Composition" version="1.0.27" targetFramework="net452" />
-  <package id="StyleCop.Analyzers" version="1.1.0-beta001" targetFramework="net452" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.1.0-beta003" targetFramework="net46" developmentDependency="true" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net46" />
   <package id="System.Collections" version="4.3.0" targetFramework="net46" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net46" />
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj
@@ -442,9 +442,8 @@
     <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta003\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta003\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/packages.config b/StyleCop.Analyzers/StyleCop.Analyzers.Test/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.2.1" targetFramework="net452" />
   <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.2.1" targetFramework="net452" />
   <package id="Microsoft.Composition" version="1.0.27" targetFramework="net452" />
-  <package id="StyleCop.Analyzers" version="1.1.0-beta001" targetFramework="net452" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.1.0-beta003" targetFramework="net452" developmentDependency="true" />
   <package id="System.Collections" version="4.0.0" targetFramework="net452" />
   <package id="System.Collections.Immutable" version="1.1.37" targetFramework="net452" />
   <package id="System.Diagnostics.Debug" version="4.0.0" targetFramework="net452" />
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/AccessLevel.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/AccessLevel.cs
@@ -24,6 +24,6 @@ internal enum AccessLevel
         Internal,
 
         /// <summary>Public access.</summary>
-        Public
+        Public,
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/ModifierOrderHelper.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/ModifierOrderHelper.cs
@@ -31,7 +31,7 @@ internal enum ModifierType
             /// <summary>
             /// Represents other modifiers i.e partial, virtual, abstract, override, extern, unsafe, new, async, const, sealed, readonly, volatile, fixed
             /// </summary>
-            Other
+            Other,
         }
 
         internal static ModifierType GetModifierType(SyntaxToken modifier)
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/UsingGroup.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/UsingGroup.cs
@@ -31,6 +31,6 @@ internal enum UsingGroup
         /// <summary>
         /// The using directive is part of the alias usings group.
         /// </summary>
-        Alias
+        Alias,
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/DeserializationFailureBehavior.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/DeserializationFailureBehavior.cs
@@ -20,6 +20,6 @@ internal enum DeserializationFailureBehavior
         /// When deserialization fails, throw a <see cref="JsonParseException"/> or
         /// <see cref="InvalidSettingsException"/> containing details about the error.
         /// </summary>
-        ThrowException
+        ThrowException,
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/FileNamingConvention.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/FileNamingConvention.cs
@@ -13,6 +13,6 @@ internal enum FileNamingConvention
         /// <summary>
         /// Files are named using the metadata convention (e.g. TypeName`2)
         /// </summary>
-        Metadata
+        Metadata,
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/OptionSetting.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/OptionSetting.cs
@@ -21,6 +21,6 @@ internal enum OptionSetting
         /// <summary>
         /// The option is not allowed.
         /// </summary>
-        Omit
+        Omit,
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/OrderingTrait.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/OrderingTrait.cs
@@ -28,6 +28,6 @@ internal enum OrderingTrait
         /// <summary>
         /// Readonly elements are ordered before non-readonly elements.
         /// </summary>
-        Readonly
+        Readonly,
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/TopLevelType.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/TopLevelType.cs
@@ -28,6 +28,6 @@ internal enum TopLevelType
         /// <summary>
         /// Enums are considered top-level types
         /// </summary>
-        Enum
+        Enum,
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/UsingDirectivesPlacement.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/UsingDirectivesPlacement.cs
@@ -21,6 +21,6 @@ internal enum UsingDirectivesPlacement
         /// <summary>
         /// Allow using directives inside or outside the namespace definition.
         /// </summary>
-        Preserve
+        Preserve,
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/StyleCop.Analyzers.csproj b/StyleCop.Analyzers/StyleCop.Analyzers/StyleCop.Analyzers.csproj
@@ -442,9 +442,8 @@
     <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta003\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta003\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="DocumentationRules\DocumentationResources.de-DE.resx">
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/packages.config b/StyleCop.Analyzers/StyleCop.Analyzers/packages.config
@@ -6,7 +6,7 @@
   <package id="Microsoft.CodeAnalysis.CSharp" version="1.2.1" targetFramework="portable45-net45+win8" />
   <package id="Microsoft.Composition" version="1.0.27" targetFramework="portable-net45+win8" />
   <package id="NuGet.CommandLine" version="2.8.3" targetFramework="portable45-net45+win8" />
-  <package id="StyleCop.Analyzers" version="1.1.0-beta001" targetFramework="portable45-net45+win8" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.1.0-beta003" targetFramework="portable45-net45+win8" developmentDependency="true" />
   <package id="System.Collections.Immutable" version="1.1.37" targetFramework="portable45-net45+win8" />
   <package id="System.Reflection.Metadata" version="1.2.0" targetFramework="portable45-net45+win8" />
   <package id="Tvl.NuGet.BuildTasks" version="1.0.0-alpha002" targetFramework="portable45-net45+win8" />
diff --git a/StyleCop.Analyzers/StyleCopTester/StyleCopTester.csproj b/StyleCop.Analyzers/StyleCopTester/StyleCopTester.csproj
@@ -141,9 +141,8 @@
     <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta003\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.1.0-beta003\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\StyleCop.Analyzers.CodeFixes\StyleCop.Analyzers.CodeFixes.csproj">
diff --git a/StyleCop.Analyzers/StyleCopTester/packages.config b/StyleCop.Analyzers/StyleCopTester/packages.config
@@ -9,7 +9,7 @@
   <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="1.2.1" targetFramework="net452" />
   <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.2.1" targetFramework="net452" />
   <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />
-  <package id="StyleCop.Analyzers" version="1.1.0-beta001" targetFramework="net452" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.1.0-beta003" targetFramework="net452" developmentDependency="true" />
   <package id="System.Collections" version="4.0.0" targetFramework="net452" />
   <package id="System.Collections.Immutable" version="1.1.37" targetFramework="net452" />
   <package id="System.Diagnostics.Debug" version="4.0.0" targetFramework="net452" />

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ internal enum AccessLevel`
`24`	`24`	`Internal,`
`25`	`25`
`26`	`26`	`/// <summary>Public access.</summary>`
`27`		`- Public`
	`27`	`+ Public,`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ internal enum ModifierType`
`31`	`31`	`/// <summary>`
`32`	`32`	`/// Represents other modifiers i.e partial, virtual, abstract, override, extern, unsafe, new, async, const, sealed, readonly, volatile, fixed`
`33`	`33`	`/// </summary>`
`34`		`- Other`
	`34`	`+ Other,`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`internal static ModifierType GetModifierType(SyntaxToken modifier)`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@ internal enum UsingGroup`
`31`	`31`	`/// <summary>`
`32`	`32`	`/// The using directive is part of the alias usings group.`
`33`	`33`	`/// </summary>`
`34`		`- Alias`
	`34`	`+ Alias,`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ internal enum DeserializationFailureBehavior`
`20`	`20`	`/// When deserialization fails, throw a <see cref="JsonParseException"/> or`
`21`	`21`	`/// <see cref="InvalidSettingsException"/> containing details about the error.`
`22`	`22`	`/// </summary>`
`23`		`- ThrowException`
	`23`	`+ ThrowException,`
`24`	`24`	`}`
`25`	`25`	`}`