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

Commit 6ae5aa5

Browse files
authored
Merge branch 'master' into fixes/vs-language-pack
2 parents 3dbe9e7 + d0ae1d5 commit 6ae5aa5

File tree

213 files changed

+6327
-10676
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+6327
-10676
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,9 @@ $RECYCLE.BIN/
232232
*.msm
233233
*.msp
234234

235+
#OpenCover output
236+
coverage.xml
237+
235238
AkavacheSqliteLinkerOverride.cs
236239
NuGetBuild
237240
WiX.Toolset.DummyFile.txt

Directory.Build.Props

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
<PropertyGroup>
3+
<Product>GitHub Extension for Visual Studio</Product>
4+
<Version>2.5.6.0</Version>
5+
<Copyright>Copyright © GitHub, Inc. 2014-2018</Copyright>
6+
<LangVersion>7.3</LangVersion>
7+
</PropertyGroup>
8+
</Project>

GitHubVS.sln

Lines changed: 59 additions & 60 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ Most of the extension UI lives in the Team Explorer pane, which is available fro
1717

1818
Official builds of this extension are available at [the official website](https://visualstudio.github.com).
1919

20-
2120
[![Build status](https://ci.appveyor.com/api/projects/status/dl8is5iqwt9qf3t7/branch/master?svg=true)](https://ci.appveyor.com/project/github-windows/visualstudio/branch/master)
21+
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/github-visual-studio/localized.svg)](https://crowdin.com/project/github-visual-studio)
22+
[![codecov](https://codecov.io/gh/GitHub/VisualStudio/branch/master/graph/badge.svg)](https://codecov.io/gh/GitHub/VisualStudio)
2223

2324
[![Join the chat at freenode:github-vs](https://img.shields.io/badge/irc-freenode:%20%23github--vs-blue.svg)](http://webchat.freenode.net/?channels=%23github-vs) [![Join the chat at https://gitter.im/github/VisualStudio](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/github/VisualStudio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
2425

appveyor.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
os: Visual Studio 2017
2-
version: '2.5.5.{build}'
2+
version: '2.5.6.{build}'
33
skip_tags: true
44
install:
55
- ps: |
@@ -29,3 +29,5 @@ on_success:
2929
if ($full_build) {
3030
script\Sign-Package -AppVeyor
3131
}
32+
on_finish:
33+
- ps: scripts\Run-CodeCoverage.ps1 -AppVeyor -Configuration:Release

codecov.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
codecov:
2+
notify:
3+
require_ci_to_pass: yes
4+
5+
coverage:
6+
precision: 2
7+
round: down
8+
range: "70...100"
9+
10+
status:
11+
project: yes
12+
patch: yes
13+
changes: yes
14+
15+
parsers:
16+
gcov:
17+
branch_detection:
18+
conditional: yes
19+
loop: yes
20+
method: no
21+
macro: no
22+
23+
comment:
24+
layout: "header, reach, diff, files"
25+
behavior: new
26+
require_changes: no
27+
28+
fixes:
29+
- "/C/projects/visualstudio/::"

crowdin.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
files:
2+
- source: /src/GitHub.Resources/Resources.resx
3+
translation: /%original_path%/Resources.%locale%.resx

global.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"msbuild-sdks": {
3+
"MSBuild.Sdk.Extras": "1.6.52"
4+
}
5+
}

scripts/Bump-Version.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ if ($Trace) { Set-PSDebug -Trace 1 }
5353
. $scriptsDirectory\Modules\Vsix.ps1 | out-null
5454
. $scriptsDirectory\Modules\SolutionInfo.ps1 | out-null
5555
. $scriptsDirectory\Modules\AppVeyor.ps1 | out-null
56+
. $scriptsDirectory\Modules\DirectoryBuildProps.ps1 | out-null
5657

5758
if ($NewVersion -eq $null) {
5859
if (!$BumpMajor -and !$BumpMinor -and !$BumpPatch -and !$BumpBuild){

scripts/Run-CodeCoverage.ps1

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<#
2+
.SYNOPSIS
3+
Runs NUnit
4+
#>
5+
6+
[CmdletBinding()]
7+
Param(
8+
[string]
9+
$Configuration
10+
,
11+
[switch]
12+
$AppVeyor = $false
13+
)
14+
15+
$scriptsDirectory = $PSScriptRoot
16+
$rootDirectory = Split-Path ($scriptsDirectory)
17+
. $scriptsDirectory\modules.ps1 | out-null
18+
19+
$nunitDirectory = Join-Path $rootDirectory packages\NUnit.ConsoleRunner.3.7.0\tools
20+
$nunitConsoleRunner = Join-Path $nunitDirectory nunit3-console.exe
21+
22+
$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",
33+
"test\MetricsTests\MetricsTests\bin\$Configuration\MetricsTests.dll",
34+
"test\TrackingCollectionTests\bin\$Configuration\TrackingCollectionTests.dll"
35+
)
36+
37+
$opencoverTargetArgs = ($testAssemblies -join " ") + " --where \`"cat!=Timings and cat!=CodeCoverageFlake\`" --inprocess --noresult"
38+
39+
$opencoverDirectory = Join-Path $rootDirectory packages\OpenCover.4.6.519\tools
40+
$opencover = Join-Path $opencoverDirectory OpenCover.Console.exe
41+
$opencoverArgs = @(
42+
"-target:`"$nunitConsoleRunner`"",
43+
"-targetargs:`"$opencoverTargetArgs`"",
44+
"-filter:`"+[GitHub*]* -[GitHub*UnitTests]*`"",
45+
"-register:user -output:$rootDirectory\coverage.xml"
46+
) -join " "
47+
48+
$codecovDirectory = Join-Path $rootDirectory packages\Codecov.1.0.5\tools
49+
$codecov = Join-Path $codecovDirectory codecov.exe
50+
$codecovArgs = "-f $rootDirectory\coverage.xml"
51+
52+
& {
53+
Trap {
54+
Write-Output "$Project tests failed"
55+
exit 0
56+
}
57+
58+
Run-Process 600 $opencover $opencoverArgs
59+
60+
if($AppVeyor) {
61+
Run-Process 60 $codecov $codecovArgs
62+
}
63+
64+
if (!$?) {
65+
Write-Output "$Project tests failed"
66+
exit 0
67+
}
68+
}

0 commit comments

Comments
 (0)