Merge remote-tracking branch 'DotNetAnalyzers:master' into pantosha:master

Author: sharwell

.editorconfig

@@ -1,5 +1,9 @@
 root = true
 
+[*.yml]
+indent_style = space
+indent_size = 2
+
 [*.cs]
 charset = utf-8-bom
 insert_final_newline = true

.nuget/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Codecov" version="1.8.0" />
+  <package id="Codecov" version="1.9.0" />
   <package id="OpenCover" version="4.6.519" />
   <package id="ReportGenerator" version="2.3.5.0" targetFramework="net452" />
   <package id="xunit.runner.console" version="2.4.1" />

NuGet.config

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
     <add key="roslyn-analyzers" value="https://dotnet.myget.org/F/roslyn-analyzers/api/v3/index.json" />
 

StyleCop.Analyzers/version.json

@@ -13,7 +13,7 @@
   },
   "cloudBuild": {
     "buildNumber": {
-      "enabled": true
+      "enabled": false
     }
   }
 }

appveyor.yml

@@ -12,20 +12,6 @@ build:
   project: StyleCopAnalyzers.sln
   verbosity: minimal
 test_script:
-- cd build
-- ps: |
-    if ($env:Configuration -eq 'Debug') {
-      .\opencover-report.ps1 -Debug -NoBuild -NoReport -AppVeyor
-      if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-      $packageConfig = [xml](Get-Content ..\.nuget\packages.config)
-      $codecov_version = $packageConfig.SelectSingleNode('/packages/package[@id="Codecov"]').version
-      $codecov = "..\packages\Codecov.$codecov_version\tools\codecov.exe"
-      &$codecov -f '..\build\OpenCover.Reports\OpenCover.StyleCopAnalyzers.xml'
-    } else {
-      .\opencover-report.ps1 -NoBuild -NoReport -AppVeyor
-      if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-    }
-- cd ..
 - .\StyleCop.Analyzers\StyleCop.Analyzers.Status.Generator\bin\%Configuration%\net46\StyleCop.Analyzers.Status.Generator.exe .\StyleCopAnalyzers.sln > StyleCop.Analyzers.Status.json
 cache:
   - packages -> **\packages.config

azure-pipelines.yml

@@ -0,0 +1,74 @@
+pool:
+  name: Azure Pipelines
+  vmImage: windows-latest
+  demands:
+  - msbuild
+  - visualstudio
+  - vstest
+
+jobs:
+- job: Build
+  variables:
+    BuildSolution: StyleCopAnalyzers.sln
+    BuildPlatform: Any CPU
+  strategy:
+    matrix:
+      Debug:
+        BuildConfiguration: Debug
+        _debugArg: '-Debug'
+      Release:
+        BuildConfiguration: Release
+        _debugArg: ''
+  steps:
+  - task: NuGetToolInstaller@0
+    displayName: 'Use NuGet 5.3.1'
+    inputs:
+      versionSpec: 5.3.1
+
+  - task: NuGetCommand@2
+    displayName: 'NuGet restore'
+    inputs:
+      restoreSolution: '$(BuildSolution)'
+      feedsToUse: 'config'
+      nugetConfigPath: 'NuGet.config'
+
+  - task: VSBuild@1
+    displayName: 'Build solution StyleCopAnalyzers.sln'
+    inputs:
+      solution: '$(BuildSolution)'
+      platform: '$(BuildPlatform)'
+      configuration: '$(BuildConfiguration)'
+      msbuildArgs: '/bl:$(Build.SourcesDirectory)/msbuild.binlog'
+
+  - task: PowerShell@2
+    displayName: Run Tests
+    inputs:
+      workingDirectory: '$(Build.SourcesDirectory)/build'
+      filePath: build/opencover-report.ps1
+      arguments: '$(_debugArg) -NoBuild -NoReport -Azure'
+
+  - task: PublishTestResults@2
+    displayName: Publish test results
+    inputs:
+      testResultsFormat: xUnit
+      testResultsFiles: 'build/*.xml'
+      mergeTestResults: true
+      testRunTitle: '$(BuildConfiguration)'
+
+  - task: PowerShell@2
+    displayName: Upload coverage reports to codecov.io
+    condition: eq(variables['BuildConfiguration'], 'Debug')
+    inputs:
+      workingDirectory: '$(Build.SourcesDirectory)/build'
+      targetType: inline
+      script: |
+        $packageConfig = [xml](Get-Content ..\.nuget\packages.config)
+        $codecov_version = $packageConfig.SelectSingleNode('/packages/package[@id="Codecov"]').version
+        $codecov = "..\packages\Codecov.$codecov_version\tools\codecov.exe"
+        &$codecov -f '..\build\OpenCover.Reports\OpenCover.StyleCopAnalyzers.xml' --required
+
+  - task: PublishBuildArtifacts@1
+    displayName: Publish build logs
+    inputs:
+      pathtoPublish: msbuild.binlog
+    condition: failed()

build/opencover-report.ps1

@@ -2,7 +2,8 @@ param (
 	[switch]$Debug,
 	[switch]$NoBuild,
 	[switch]$NoReport,
-	[switch]$AppVeyor
+	[switch]$AppVeyor,
+	[switch]$Azure
 )
 
 If (-not $NoBuild) {
@@ -51,6 +52,8 @@ $register_mode = 'user'
 If ($AppVeyor) {
 	$AppVeyorArg = '-appveyor'
 	$register_mode = 'Path32'
+} ElseIf ($Azure) {
+	$register_mode = 'Path32'
 }
 
 &$opencover_console `
@@ -63,9 +66,9 @@ If ($AppVeyor) {
 	-excludebyfile:*\*Designer.cs `
 	-output:"$report_folder\OpenCover.StyleCopAnalyzers.xml" `
 	-target:"$xunit_runner_console_net452" `
-	-targetargs:"$target_dll -noshadow $AppVeyorArg"
+	-targetargs:"$target_dll -noshadow $AppVeyorArg -xml StyleCopAnalyzers.xunit.xml"
 
-If ($AppVeyor -and -not $?) {
+If (($AppVeyor -or $Azure) -and -not $?) {
 	$host.UI.WriteErrorLine('Build failed; coverage analysis aborted.')
 	Exit $LASTEXITCODE
 }
@@ -81,9 +84,9 @@ If ($AppVeyor -and -not $?) {
 	-output:"$report_folder\OpenCover.StyleCopAnalyzers.xml" `
 	-mergebyhash -mergeoutput `
 	-target:"$xunit_runner_console_net46" `
-	-targetargs:"$target_dll_csharp7 -noshadow $AppVeyorArg"
+	-targetargs:"$target_dll_csharp7 -noshadow $AppVeyorArg -xml StyleCopAnalyzers.CSharp7.xunit.xml"
 
-If ($AppVeyor -and -not $?) {
+If (($AppVeyor -or $Azure) -and -not $?) {
 	$host.UI.WriteErrorLine('Build failed; coverage analysis aborted.')
 	Exit $LASTEXITCODE
 }
@@ -99,9 +102,9 @@ If ($AppVeyor -and -not $?) {
 	-output:"$report_folder\OpenCover.StyleCopAnalyzers.xml" `
 	-mergebyhash -mergeoutput `
 	-target:"$xunit_runner_console_net472" `
-	-targetargs:"$target_dll_csharp8 -noshadow $AppVeyorArg"
+	-targetargs:"$target_dll_csharp8 -noshadow $AppVeyorArg -xml StyleCopAnalyzers.CSharp8.xunit.xml"
 
-If ($AppVeyor -and -not $?) {
+If (($AppVeyor -or $Azure) -and -not $?) {
 	$host.UI.WriteErrorLine('Build failed; coverage analysis aborted.')
 	Exit $LASTEXITCODE
 }