Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 0a5d6e5

Browse files
StanleyGoldmanStanleyGoldman
committed
Merge branch 'master' into update-rx
# Conflicts: # test/MetricsTests/MetricsTests/packages.config
2 parents b61da4b + 752bc8f commit 0a5d6e5

File tree

27 files changed

+90
-44
lines changed

27 files changed

+90
-44
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,9 @@ $RECYCLE.BIN/
235235
#OpenCover output
236236
coverage.xml
237237

238+
#Msbuild binary log output
239+
output.binlog
240+
238241
AkavacheSqliteLinkerOverride.cs
239242
NuGetBuild
240243
WiX.Toolset.DummyFile.txt

‎GitHubVS.sln‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{7B6C
4444
scripts\common.ps1 = scripts\common.ps1
4545
scripts\Get-CheckedOutBranch.ps1 = scripts\Get-CheckedOutBranch.ps1
4646
scripts\Get-HeadSha1.ps1 = scripts\Get-HeadSha1.ps1
47+
scripts\modules.ps1 = scripts\modules.ps1
4748
nuget.config = nuget.config
4849
scripts\Require-CleanWorkTree.ps1 = scripts\Require-CleanWorkTree.ps1
50+
scripts\Run-CodeCoverage.ps1 = scripts\Run-CodeCoverage.ps1
4951
scripts\Run-NUnit.ps1 = scripts\Run-NUnit.ps1
5052
scripts\Run-Tests.ps1 = scripts\Run-Tests.ps1
5153
scripts\Run-XUnit.ps1 = scripts\Run-XUnit.ps1

‎appveyor.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,5 @@ on_success:
3131
}
3232
on_finish:
3333
- 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%"

‎codecov.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ coverage:
1010
status:
1111
project: yes
1212
patch: yes
13-
changes: yes
13+
changes: no
1414

1515
parsers:
1616
gcov:
@@ -27,3 +27,8 @@ comment:
2727

2828
fixes:
2929
- "/C/projects/visualstudio/::"
30+
31+
ignore:
32+
- "*.xaml"
33+
- "*.xaml.cs"
34+
- "**/SampleData/*"

‎lib/BCC-MSBuildLog.0.0.2-alpha.nupkg‎

7.41 MB
Binary file not shown.

‎lib/BCC-Submission.0.0.2-alpha.nupkg‎

1.13 MB
Binary file not shown.

‎scripts/Run-CodeCoverage.ps1‎

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,49 +20,64 @@ $nunitDirectory = Join-Path $rootDirectory packages\NUnit.ConsoleRunner.3.7.0\to
2020
$nunitConsoleRunner = Join-Path $nunitDirectory nunit3-console.exe
2121

2222
$testAssemblies = @(
23-
"test\GitHub.Api.UnitTests\bin\$Configuration\GitHub.Api.UnitTests.dll",
24-
"test\GitHub.App.UnitTests\bin\$Configuration\GitHub.App.UnitTests.dll",
25-
"test\GitHub.Exports.Reactive.UnitTests\bin\$Configuration\GitHub.Exports.Reactive.UnitTests.dll",
26-
"test\GitHub.Exports.UnitTests\bin\$Configuration\GitHub.Exports.UnitTests.dll",
27-
"test\GitHub.Extensions.UnitTests\bin\$Configuration\GitHub.Extensions.UnitTests.dll",
28-
"test\GitHub.InlineReviews.UnitTests\bin\$Configuration\GitHub.InlineReviews.UnitTests.dll",
29-
"test\GitHub.Primitives.UnitTests\bin\$Configuration\GitHub.Primitives.UnitTests.dll",
30-
"test\GitHub.TeamFoundation.UnitTests\bin\$Configuration\GitHub.TeamFoundation.UnitTests.dll",
31-
"test\GitHub.UI.UnitTests\bin\$Configuration\GitHub.UI.UnitTests.dll",
32-
"test\GitHub.VisualStudio.UnitTests\bin\$Configuration\GitHub.VisualStudio.UnitTests.dll",
23+
"test\GitHub.Api.UnitTests\bin\$Configuration\net461\GitHub.Api.UnitTests.dll",
24+
"test\GitHub.App.UnitTests\bin\$Configuration\net461\GitHub.App.UnitTests.dll",
25+
"test\GitHub.Exports.Reactive.UnitTests\bin\$Configuration\net461\GitHub.Exports.Reactive.UnitTests.dll",
26+
"test\GitHub.Exports.UnitTests\bin\$Configuration\net461\GitHub.Exports.UnitTests.dll",
27+
"test\GitHub.Extensions.UnitTests\bin\$Configuration\net461\GitHub.Extensions.UnitTests.dll",
28+
"test\GitHub.InlineReviews.UnitTests\bin\$Configuration\net461\GitHub.InlineReviews.UnitTests.dll",
29+
"test\GitHub.TeamFoundation.UnitTests\bin\$Configuration\net461\GitHub.TeamFoundation.UnitTests.dll",
30+
"test\GitHub.UI.UnitTests\bin\$Configuration\net461\GitHub.UI.UnitTests.dll",
31+
"test\GitHub.VisualStudio.UnitTests\bin\$Configuration\net461\GitHub.VisualStudio.UnitTests.dll",
3332
"test\MetricsTests\MetricsTests\bin\$Configuration\MetricsTests.dll",
34-
"test\TrackingCollectionTests\bin\$Configuration\TrackingCollectionTests.dll"
33+
"test\TrackingCollectionTests\bin\$Configuration\net461\TrackingCollectionTests.dll"
3534
)
3635

3736
$opencoverTargetArgs = ($testAssemblies -join " ") + " --where \`"cat!=Timings and cat!=CodeCoverageFlake\`" --inprocess --noresult"
3837

39-
$opencoverDirectory = Join-Path $rootDirectory packages\OpenCover.4.6.519\tools
38+
$opencoverDirectory = Join-Path $env:USERPROFILE .nuget\packages\opencover\4.6.519\tools
4039
$opencover = Join-Path $opencoverDirectory OpenCover.Console.exe
4140
$opencoverArgs = @(
4241
"-target:`"$nunitConsoleRunner`"",
4342
"-targetargs:`"$opencoverTargetArgs`"",
44-
"-filter:`"+[GitHub*]* -[GitHub*UnitTests]*`"",
43+
"-filter:`"+[GitHub*]* -[GitHub*Unit]GitHub.*.SampleData -[GitHub*UnitTests]*`"",
44+
"-excludebyfile:*.xaml;*.xaml.cs",
4545
"-register:user -output:$rootDirectory\coverage.xml"
4646
) -join " "
4747

48-
$codecovDirectory = Join-Path $rootDirectory packages\Codecov.1.0.5\tools
48+
$codecovDirectory = Join-Path $env:USERPROFILE .nuget\packages\codecov\1.1.0\tools
4949
$codecov = Join-Path $codecovDirectory codecov.exe
5050
$codecovArgs = "-f $rootDirectory\coverage.xml"
5151

5252
& {
5353
Trap {
54-
Write-Output "$Project tests failed"
54+
Write-Output "OpenCover trapped"
5555
exit 0
5656
}
5757

58-
Run-Process 600 $opencover $opencoverArgs
58+
Write-Output $opencover
5959

60-
if($AppVeyor) {
61-
Run-Process 60 $codecov $codecovArgs
62-
}
60+
Run-Process 600 $opencover $opencoverArgs
6361

6462
if (!$?) {
65-
Write-Output "$Project tests failed"
63+
Write-Output "OpenCover failed"
6664
exit 0
6765
}
6866
}
67+
68+
if($AppVeyor) {
69+
& {
70+
Trap {
71+
Write-Output "Codecov trapped"
72+
exit 0
73+
}
74+
75+
Push-AppveyorArtifact "$rootDirectory\coverage.xml"
76+
Run-Process 300 $codecov $codecovArgs
77+
78+
if (!$?) {
79+
Write-Output "Codecov failed"
80+
exit 0
81+
}
82+
}
83+
}

‎scripts/modules.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ New-Module -ScriptBlock {
129129

130130
$msbuild = Find-MSBuild
131131

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 }
134134
}
135135

136136
Export-ModuleMember -Function Find-MSBuild,Build-Solution

‎src/CredentialManagement/CredentialManagement.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net461</TargetFramework>
4+
<DebugType>full</DebugType>
5+
<DebugSymbols>true</DebugSymbols>
46
</PropertyGroup>
57
<Import Project="$(SolutionDir)\src\common\signing.props" />
68
<ItemGroup>

‎src/GitHub.Api/GitHub.Api.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net461</TargetFramework>
4+
<DebugType>full</DebugType>
5+
<DebugSymbols>true</DebugSymbols>
46
</PropertyGroup>
57

68
<Import Project="$(SolutionDir)\src\common\signing.props" />

0 commit comments

Comments
 (0)