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

Commit 8da6626

Browse files
authored
Merge branch 'master' into fixes/tool-window-discoverability
2 parents b46f7ca + 0176faf commit 8da6626

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ jobs:
4848

4949
- name: MSBuild ${{ env.githubvsSolution }}
5050
run: |
51-
msbuild ${{ env.githubvsSolution }} /p:Configuration=${{ env.config }} /p:TargetVsixContainer=${{ env.vsixContainer }} /p:DeployExtension=False /p:GitHubVS_ClientId=${{ secrets.GitHubVS_ClientId }} /p:GitHubVS_ClientSecret=${{ secrets.GitHubVS_ClientSecret }}
51+
msbuild ${{ env.githubvsSolution }} /p:Configuration=${{ env.config }} /p:TargetVsixContainer=${{ env.vsixContainer }} /p:DeployExtension=False /verbosity:minimal
52+
env:
53+
GitHubVS_ClientId: ${{ secrets.GitHubVS_ClientId }}
54+
GitHubVS_ClientSecret: ${{ secrets.GitHubVS_ClientSecret }}
5255

5356
- name: Upload VSIX artifact
5457
uses: actions/upload-artifact@v1

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Most of the extension UI lives in the Team Explorer pane, which is available fro
77

88
Official builds of this extension are available at the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=GitHub.GitHubExtensionforVisualStudio).
99

10-
[![Build Status](https://github-editor-tools.visualstudio.com/VisualStudio/_apis/build/status/github.VisualStudio?branchName=master)](https://github-editor-tools.visualstudio.com/VisualStudio/_build/latest?definitionId=10&branchName=master)
10+
![CI](https://github.com/github/visualstudio/workflows/CI/badge.svg)
1111

1212
[![Follow GitHub for Visual Studio](https://img.shields.io/twitter/follow/GitHubVS.svg?style=social "Follow GitHubVS")](https://twitter.com/githubvs?ref_src=twsrc%5Etfw) [![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)
1313

src/GitHub.Api/GitHub.Api.csproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@
44
<DebugType>full</DebugType>
55
<DebugSymbols>true</DebugSymbols>
66
</PropertyGroup>
7-
7+
8+
<PropertyGroup>
9+
<!-- Use a default client ID/secret for testing -->
10+
<!-- https://github.com/organizations/editor-tools/settings/applications/620133 -->
11+
<GitHubVS_ClientId Condition="'$(GitHubVS_ClientId)' == ''">2454a3e6102fd41cc212</GitHubVS_ClientId>
12+
<GitHubVS_ClientSecret Condition="'$(GitHubVS_ClientSecret)' == ''">2157c138e970165d955d09562230afcfbcda23f2</GitHubVS_ClientSecret>
13+
</PropertyGroup>
14+
815
<Import Project="$(SolutionDir)\src\common\signing.props" />
916

1017
<Target Name="AddClientSecret" BeforeTargets="BeforeCompile"

0 commit comments

Comments
 (0)