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

Commit cefb047

Browse files
Merge branch 'master' into codecoverage-tweaks
2 parents 81c017c + 79ab9b0 commit cefb047

File tree

240 files changed

+4999
-4248
lines changed

Some content is hidden

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

240 files changed

+4999
-4248
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
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<ProjectConfiguration>
22
<Settings>
3+
<AdditionalFilesToIncludeForProject>
4+
<Value>xlf\**.*</Value>
5+
</AdditionalFilesToIncludeForProject>
36
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
47
</Settings>
58
</ProjectConfiguration>

Directory.Build.Props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
33
<Product>GitHub Extension for Visual Studio</Product>
4-
<Version>2.5.6.0</Version>
4+
<Version>2.5.7.0</Version>
55
<Copyright>Copyright © GitHub, Inc. 2014-2018</Copyright>
6-
<LangVersion>7.3</LangVersion>
6+
<LangVersion>7.3</LangVersion>
77
</PropertyGroup>
88
</Project>

GitHubVS.sln

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.TeamFoundation.UnitT
125125
EndProject
126126
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.VisualStudio.UnitTests", "test\GitHub.VisualStudio.UnitTests\GitHub.VisualStudio.UnitTests.csproj", "{8B14F90B-0781-465D-AB94-19C8C56E3A94}"
127127
EndProject
128+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Resources", "src\GitHub.Resources\GitHub.Resources.csproj", "{54E8D71A-AABB-4698-95FE-7F11612B8E59}"
129+
EndProject
128130
Global
129131
GlobalSection(SolutionConfigurationPlatforms) = preSolution
130132
Debug|Any CPU = Debug|Any CPU
@@ -494,6 +496,16 @@ Global
494496
{8B14F90B-0781-465D-AB94-19C8C56E3A94}.Release|Any CPU.Build.0 = Release|Any CPU
495497
{8B14F90B-0781-465D-AB94-19C8C56E3A94}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
496498
{8B14F90B-0781-465D-AB94-19C8C56E3A94}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
499+
{54E8D71A-AABB-4698-95FE-7F11612B8E59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
500+
{54E8D71A-AABB-4698-95FE-7F11612B8E59}.Debug|Any CPU.Build.0 = Debug|Any CPU
501+
{54E8D71A-AABB-4698-95FE-7F11612B8E59}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
502+
{54E8D71A-AABB-4698-95FE-7F11612B8E59}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
503+
{54E8D71A-AABB-4698-95FE-7F11612B8E59}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
504+
{54E8D71A-AABB-4698-95FE-7F11612B8E59}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
505+
{54E8D71A-AABB-4698-95FE-7F11612B8E59}.Release|Any CPU.ActiveCfg = Release|Any CPU
506+
{54E8D71A-AABB-4698-95FE-7F11612B8E59}.Release|Any CPU.Build.0 = Release|Any CPU
507+
{54E8D71A-AABB-4698-95FE-7F11612B8E59}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
508+
{54E8D71A-AABB-4698-95FE-7F11612B8E59}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
497509
EndGlobalSection
498510
GlobalSection(SolutionProperties) = preSolution
499511
HideSolutionNode = FALSE

README.md

Lines changed: 1 addition & 1 deletion

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.6.{build}'
2+
version: '2.5.7.{build}'
33
skip_tags: true
44
install:
55
- ps: |
@@ -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: 1 addition & 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:

crowdin.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
preserve_hierarchy: true
2+
3+
files:
4+
- source: /src/GitHub.Resources/Resources.resx
5+
translation: /%original_path%/Resources.%locale%.resx
6+
- source: /src/GitHub.VisualStudio/xlf/GitHub.VisualStudio.vsct.zh-CN.xlf
7+
translation: /%original_path%/GitHub.VisualStudio.vsct.%locale%.xlf
8+
- source: /src/GitHub.VisualStudio/xlf/VSPackage.zh-CN.xlf
9+
translation: /%original_path%/VSPackage.%locale%.xlf

docs/contributing/cloning-a-repository-to-visual-studio.md

Lines changed: 0 additions & 19 deletions
This file was deleted.

docs/contributing/creating-gists.md

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)