Merge branch 'master' into fixes/remove-experimental-PR-file-margin

Author: jcansdale

.github/workflows/main.yml

@@ -0,0 +1,81 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+env:
+  config: Release
+  githubvsSolution: GitHubVS.sln
+  vsixContainer: ${{ github.workspace }}\GitHub.VisualStudio.vsix
+  
+# Controls when the action will run. Triggers the workflow on push or pull request 
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: windows-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v1
+      with:
+        submodules: true
+
+    - name: Nerdbank.GitVersioning
+      uses: aarnott/[email protected]
+      id: nbgv
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/[email protected]
+
+    - uses: nuget/setup-nuget@v1
+      with:
+        nuget-version: '5.x'
+
+    - name: Add VSTest to PATH
+      uses: darenm/Setup-VSTest@v1
+
+    - name: NuGet restore ${{ env.githubvsSolution }}
+      run: nuget restore ${{ env.githubvsSolution }}
+
+    - name: MSBuild ${{ env.githubvsSolution }}
+      run: |
+        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 }}
+
+    - name: Upload VSIX artifact
+      uses: actions/upload-artifact@v1
+      with:
+        name: GitHubVS-${{ steps.nbgv.outputs.SemVer2 }}
+        path: ${{ env.vsixContainer }}
+
+    # We need to run '**\bin\**\*Tests.dll'
+    - run: vstest.console /TestAdapterPath:test /Settings:test\test.runsettings test\GitHub.App.UnitTests\bin\${{ env.config }}\net46\GitHub.App.UnitTests.dll
+      continue-on-error: true
+    - run: vstest.console /TestAdapterPath:test /Settings:test\test.runsettings test\GitHub.Exports.Reactive.UnitTests\bin\${{ env.config }}\net46\GitHub.Exports.Reactive.UnitTests.dll
+      continue-on-error: true
+    - run: vstest.console /TestAdapterPath:test /Settings:test\test.runsettings test\GitHub.Exports.UnitTests\bin\${{ env.config }}\net46\GitHub.Exports.UnitTests.dll
+      continue-on-error: true
+    - run: vstest.console /TestAdapterPath:test /Settings:test\test.runsettings test\GitHub.Extensions.UnitTests\bin\${{ env.config }}\net46\GitHub.Extensions.UnitTests.dll
+      continue-on-error: true
+    - run: vstest.console /TestAdapterPath:test /Settings:test\test.runsettings test\GitHub.InlineReviews.UnitTests\bin\${{ env.config }}\net46\GitHub.InlineReviews.UnitTests.dll
+      continue-on-error: true
+    - run: vstest.console /TestAdapterPath:test /Settings:test\test.runsettings test\GitHub.Services.Vssdk.UnitTests\bin\${{ env.config }}\net461\GitHub.Services.Vssdk.UnitTests.dll
+      continue-on-error: true
+    - run: vstest.console /TestAdapterPath:test /Settings:test\test.runsettings test\GitHub.StartPage.UnitTests\bin\${{ env.config }}\net46\GitHub.StartPage.UnitTests.dll
+      continue-on-error: true
+    - run: vstest.console /TestAdapterPath:test /Settings:test\test.runsettings test\GitHub.TeamFoundation.UnitTests\bin\${{ env.config }}\net46\GitHub.TeamFoundation.UnitTests.dll
+      continue-on-error: true
+    - run: vstest.console /TestAdapterPath:test /Settings:test\test.runsettings test\GitHub.UI.UnitTests\bin\${{ env.config }}\net46\GitHub.UI.UnitTests.dll
+      continue-on-error: true
+    - run: vstest.console /TestAdapterPath:test /Settings:test\test.runsettings test\GitHub.VisualStudio.UnitTests\bin\${{ env.config }}\net46\GitHub.VisualStudio.UnitTests.dll
+      continue-on-error: true
+    - run: vstest.console /TestAdapterPath:test /Settings:test\test.runsettings test\MetricsTests\MetricsTests\bin\${{ env.config }}\MetricsTests.dll
+      continue-on-error: true

README.md

@@ -72,4 +72,3 @@ Visit the [Contributor Guidelines](CONTRIBUTING.md) for details on how to contri
 Copyright 2015 - 2019 GitHub, Inc.
 
 Licensed under the [MIT License](LICENSE.md)
-

src/GitHub.Api/GitHub.Api.csproj

@@ -4,7 +4,14 @@
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
-  
+   
+  <PropertyGroup>
+    <!-- Use a default client ID/secret for testing -->
+    <!-- https://github.com/organizations/editor-tools/settings/applications/620133 -->
+    <GitHubVS_ClientId Condition="'$(GitHubVS_ClientId)' == ''">2454a3e6102fd41cc212</GitHubVS_ClientId>
+    <GitHubVS_ClientSecret Condition="'$(GitHubVS_ClientSecret)' == ''">2157c138e970165d955d09562230afcfbcda23f2</GitHubVS_ClientSecret>
+  </PropertyGroup>
+   
   <Import Project="$(SolutionDir)\src\common\signing.props" />
 
   <Target Name="AddClientSecret" BeforeTargets="BeforeCompile"