Merge branch 'master' into fix-code-coverage

StanleyGoldman · StanleyGoldman · commit b7bbdd064024 · 2018-10-05T12:05:48.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -235,6 +235,9 @@ $RECYCLE.BIN/
 #OpenCover output
 coverage.xml
 
+#Msbuild binary log output
+output.binlog
+
 AkavacheSqliteLinkerOverride.cs
 NuGetBuild
 WiX.Toolset.DummyFile.txt
diff --git a/appveyor.yml b/appveyor.yml
@@ -31,3 +31,5 @@ on_success:
     }
 on_finish:
 - ps: scripts\Run-CodeCoverage.ps1 -AppVeyor -Configuration:Release
+- IF NOT "%BCC_TOKEN%x"=="x" %USERPROFILE%\.nuget\packages\bcc-msbuildlog\0.0.2-alpha\tools\net471\BCC.MSBuildLog.exe -i output.binlog -o checkrun.json -c "%APPVEYOR_BUILD_FOLDER%"
+- IF NOT "%BCC_TOKEN%x"=="x" %USERPROFILE%\.nuget\packages\bcc-submission\0.0.2-alpha\tools\net471\BCC.Submission.exe -i checkrun.json -t "%BCC_TOKEN%" -h "%APPVEYOR_REPO_COMMIT%"
diff --git a/lib/BCC-MSBuildLog.0.0.2-alpha.nupkg b/lib/BCC-MSBuildLog.0.0.2-alpha.nupkg
diff --git a/lib/BCC-Submission.0.0.2-alpha.nupkg b/lib/BCC-Submission.0.0.2-alpha.nupkg
diff --git a/scripts/modules.ps1 b/scripts/modules.ps1
@@ -129,8 +129,8 @@ New-Module -ScriptBlock {
 
         $msbuild = Find-MSBuild
 
-        Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 $flag1 $flag2"
-        Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 $flag1 $flag2 }
+        Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 /bl:output.binlog $flag1 $flag2"
+        Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 /bl:output.binlog $flag1 $flag2 }
     }
 
     Export-ModuleMember -Function Find-MSBuild,Build-Solution
diff --git a/test/GitHub.VisualStudio.UnitTests/GitHub.VisualStudio.UnitTests.csproj b/test/GitHub.VisualStudio.UnitTests/GitHub.VisualStudio.UnitTests.csproj
@@ -21,6 +21,8 @@
 
   <ItemGroup>
     <PackageReference Include="Codecov" Version="1.1.0" />
+    <PackageReference Include="BCC-MSBuildLog" Version="0.0.2-alpha" />
+    <PackageReference Include="BCC-Submission" Version="0.0.2-alpha" />
     <PackageReference Include="NSubstitute" Version="2.0.3" />
     <PackageReference Include="NUnit" version="3.9.0" />
     <PackageReference Include="Rx-Main" Version="2.2.5-custom" targetFramework="net45" />

Original file line number	Diff line number	Diff line change
`@@ -31,3 +31,5 @@ on_success:`
`31`	`31`	`}`
`32`	`32`	`on_finish:`
`33`	`33`	`- ps: scripts\Run-CodeCoverage.ps1 -AppVeyor -Configuration:Release`
	`34`	`+- IF NOT "%BCC_TOKEN%x"=="x" %USERPROFILE%\.nuget\packages\bcc-msbuildlog\0.0.2-alpha\tools\net471\BCC.MSBuildLog.exe -i output.binlog -o checkrun.json -c "%APPVEYOR_BUILD_FOLDER%"`
	`35`	`+- IF NOT "%BCC_TOKEN%x"=="x" %USERPROFILE%\.nuget\packages\bcc-submission\0.0.2-alpha\tools\net471\BCC.Submission.exe -i checkrun.json -t "%BCC_TOKEN%" -h "%APPVEYOR_REPO_COMMIT%"`
Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,8 @@ New-Module -ScriptBlock {`
`129`	`129`
`130`	`130`	`$msbuild = Find-MSBuild`
`131`	`131`
`132`		`- Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 $flag1 $flag2"`
`133`		`- Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 $flag1 $flag2 }`
	`132`	`+ Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 /bl:output.binlog $flag1 $flag2"`
	`133`	`+ Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 /bl:output.binlog $flag1 $flag2 }`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`Export-ModuleMember -Function Find-MSBuild,Build-Solution`