Merge remote-tracking branch 'DotNetAnalyzers/stabilization'

sharwell · sharwell · commit bbd37ff76751 · 2015-12-29T21:50:36.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ packages/
 *.suo
 *.user
 TestResults/
+OpenCover.Reports/
 .nuget/NuGet.exe
 build/nuget/
 *.log
diff --git a/.nuget/packages.config b/.nuget/packages.config
@@ -2,4 +2,6 @@
 <packages>
   <package id="NuGet.CommandLine" version="2.8.3" />
   <package id="OpenCover" version="4.6.247-rc" />
+  <package id="ReportGenerator" version="2.3.5.0" targetFramework="net452" />
+  <package id="xunit.runner.console" version="2.1.0" targetFramework="net452" />
 </packages>
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/Properties/AssemblyInfo.cs b/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/Properties/AssemblyInfo.cs
@@ -35,8 +35,8 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.30")]
-[assembly: AssemblyFileVersion("1.0.0.30")]
+[assembly: AssemblyVersion("1.0.0.31")]
+[assembly: AssemblyFileVersion("1.0.0.31")]
 [assembly: AssemblyInformationalVersion("1.0.0-dev")]
 
 [assembly: InternalsVisibleTo("StyleCop.Analyzers.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c36d40d996fcc95fb6a89754728616758f459026e31478ce93633b3e27a4af416f103aa3d7a9e7998f829f8715cc1240d30724fd662042550fa71357b19562622424267e9e4640c403edbe64709a9ca5918128a9b9020b0db6e770d0dd1eac888869c23a835b74bde00e171984b1d1c24636cf030f0b23106e73035a2be145a6")]
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/StyleCop.Analyzers.CodeFixes.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/StyleCop.Analyzers.CodeFixes.csproj
@@ -215,9 +215,9 @@
     <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc3\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
@@ -9,7 +9,7 @@
   <package id="Microsoft.Composition" version="1.0.27" targetFramework="portable-net45+win8" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="portable45-net45+win8" />
   <package id="NuGet.CommandLine" version="2.8.3" targetFramework="portable45-net45+win8" />
-  <package id="StyleCop.Analyzers" version="1.0.0-rc2" targetFramework="portable45-net45+win8" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.0.0-rc3" targetFramework="portable45-net45+win8" developmentDependency="true" />
   <package id="System.Collections.Immutable" version="1.1.36" targetFramework="portable45-net45+win8" />
   <package id="System.Reflection.Metadata" version="1.0.21" 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/StyleCop.Analyzers.Test.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj
@@ -394,9 +394,9 @@
     <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc3\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
@@ -8,7 +8,7 @@
   <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0" targetFramework="net452" />
   <package id="Microsoft.Composition" version="1.0.27" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="StyleCop.Analyzers" version="1.0.0-rc2" targetFramework="net452" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.0.0-rc3" targetFramework="net452" developmentDependency="true" />
   <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net452" />
   <package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net452" />
   <package id="xunit" version="2.1.0-beta4-build3109" targetFramework="net452" />
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Properties/AssemblyInfo.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Properties/AssemblyInfo.cs
@@ -35,8 +35,8 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.30")]
-[assembly: AssemblyFileVersion("1.0.0.30")]
+[assembly: AssemblyVersion("1.0.0.31")]
+[assembly: AssemblyFileVersion("1.0.0.31")]
 [assembly: AssemblyInformationalVersion("1.0.0-dev")]
 
 #if DEVELOPMENT_KEY
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/StyleCop.Analyzers.csproj b/StyleCop.Analyzers/StyleCop.Analyzers/StyleCop.Analyzers.csproj
@@ -388,9 +388,9 @@
     <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="DocumentationRules\DocumentationResources.resx">
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/packages.config b/StyleCop.Analyzers/StyleCop.Analyzers/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.Composition" version="1.0.27" targetFramework="portable-net45+win8" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="portable45-net45+win8" />
   <package id="NuGet.CommandLine" version="2.8.3" targetFramework="portable45-net45+win8" />
-  <package id="StyleCop.Analyzers" version="1.0.0-rc2" targetFramework="portable45-net45+win8" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.0.0-rc3" targetFramework="portable45-net45+win8" developmentDependency="true" />
   <package id="System.Collections.Immutable" version="1.1.36" targetFramework="portable45-net45+win8" />
   <package id="System.Reflection.Metadata" version="1.0.21" 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
@@ -145,9 +145,9 @@
     <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-rc3\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.0.0" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />
-  <package id="StyleCop.Analyzers" version="1.0.0-rc2" targetFramework="net452" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.0.0-rc3" targetFramework="net452" developmentDependency="true" />
   <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
   <package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
 </packages>
diff --git a/build/build.ps1 b/build/build.ps1
@@ -76,7 +76,7 @@ If (-not $?) {
 	exit $LASTEXITCODE
 }
 
-if (-not $Incremental) {
+if ($Incremental) {
 	# Skip NuGet validation and copying packages to the output directory
 	exit 0
 }
diff --git a/opencover-report.bat b/opencover-report.bat
@@ -0,0 +1,48 @@
+@set packages_folder=.\packages
+@set opencover_console=%packages_folder%\OpenCover.4.6.247-rc\tools\OpenCover.Console.exe
+@set xunit_runner_console=%packages_folder%\xunit.runner.console.2.1.0\tools\xunit.console.x86.exe
+@set report_generator=%packages_folder%\ReportGenerator.2.3.5.0\tools\ReportGenerator.exe
+@set report_folder=.\OpenCover.Reports
+@set target_dll=.\StyleCop.Analyzers\StyleCop.Analyzers.Test\bin\Debug\StyleCop.Analyzers.Test.dll
+@if not exist %target_dll% goto error_target_dll
+@if not exist %opencover_console% goto error_opencover_console
+@if not exist %xunit_runner_console% goto error_xunit_runner_console
+@if not exist %report_generator% goto error_report_generator
+
+@if exist %report_folder%\. (del /Q %report_folder%\*) else (md %report_folder%)
+@%opencover_console% ^
+-register:user ^
+-threshold:1 ^
+-returntargetcode ^
+-hideskipped:All ^
+-filter:"+[StyleCop*]*" ^
+-excludebyattribute:*.ExcludeFromCodeCoverage* ^
+-output:"%report_folder%\OpenCover.StyleCopAnalyzers.xml" ^
+-target:"%xunit_runner_console%" ^
+-targetargs:"%target_dll% -noshadow"
+
+@%report_generator% -targetdir:%report_folder% -reports:%report_folder%\OpenCover.*.xml
+
+@goto end
+
+:error_target_dll
+@echo target dll not found (build target?)
+@echo %target_dll%
+@goto end
+
+:error_opencover_console
+@echo OpenCover Console not found (nuget restore?)
+@echo %opencover_console%
+@goto end
+
+:error_xunit_runner_console
+@echo OpenCover Console not found (nuget restore?)
+@echo %xunit_runner_console%
+@goto end
+
+:error_report_generator
+@echo Report Generator not found (nuget restore?)
+@echo %report_generator%
+@goto end
+
+:end
