Merge branch 'fix-code-coverage' into codecoverage-tweaks

Author: StanleyGoldman

GitHubVS.sln

@@ -13,9 +13,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Meta", "Meta", "{72036B62-2
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.UI", "src\GitHub.UI\GitHub.UI.csproj", "{346384DD-2445-4A28-AF22-B45F3957BD89}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.UI", "src\GitHub.UI\GitHub.UI.csproj", "{346384DD-2445-4A28-AF22-B45F3957BD89}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.UI.Reactive", "src\GitHub.UI.Reactive\GitHub.UI.Reactive.csproj", "{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.UI.Reactive", "src\GitHub.UI.Reactive\GitHub.UI.Reactive.csproj", "{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Extensions", "src\GitHub.Extensions\GitHub.Extensions.csproj", "{6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}"
 EndProject
@@ -44,8 +44,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{7B6C
 		scripts\common.ps1 = scripts\common.ps1
 		scripts\Get-CheckedOutBranch.ps1 = scripts\Get-CheckedOutBranch.ps1
 		scripts\Get-HeadSha1.ps1 = scripts\Get-HeadSha1.ps1
+		scripts\modules.ps1 = scripts\modules.ps1
 		nuget.config = nuget.config
 		scripts\Require-CleanWorkTree.ps1 = scripts\Require-CleanWorkTree.ps1
+		scripts\Run-CodeCoverage.ps1 = scripts\Run-CodeCoverage.ps1
 		scripts\Run-NUnit.ps1 = scripts\Run-NUnit.ps1
 		scripts\Run-Tests.ps1 = scripts\Run-Tests.ps1
 		scripts\Run-XUnit.ps1 = scripts\Run-XUnit.ps1

scripts/Run-CodeCoverage.ps1

@@ -20,18 +20,17 @@ $nunitDirectory = Join-Path $rootDirectory packages\NUnit.ConsoleRunner.3.7.0\to
 $nunitConsoleRunner = Join-Path $nunitDirectory nunit3-console.exe
 
 $testAssemblies = @(
-    "test\GitHub.Api.UnitTests\bin\$Configuration\GitHub.Api.UnitTests.dll",
-    "test\GitHub.App.UnitTests\bin\$Configuration\GitHub.App.UnitTests.dll",
-    "test\GitHub.Exports.Reactive.UnitTests\bin\$Configuration\GitHub.Exports.Reactive.UnitTests.dll",
-    "test\GitHub.Exports.UnitTests\bin\$Configuration\GitHub.Exports.UnitTests.dll",
-    "test\GitHub.Extensions.UnitTests\bin\$Configuration\GitHub.Extensions.UnitTests.dll",
-    "test\GitHub.InlineReviews.UnitTests\bin\$Configuration\GitHub.InlineReviews.UnitTests.dll",
-    "test\GitHub.Primitives.UnitTests\bin\$Configuration\GitHub.Primitives.UnitTests.dll",
-    "test\GitHub.TeamFoundation.UnitTests\bin\$Configuration\GitHub.TeamFoundation.UnitTests.dll",
-    "test\GitHub.UI.UnitTests\bin\$Configuration\GitHub.UI.UnitTests.dll",
-    "test\GitHub.VisualStudio.UnitTests\bin\$Configuration\GitHub.VisualStudio.UnitTests.dll",
+    "test\GitHub.Api.UnitTests\bin\$Configuration\net461\GitHub.Api.UnitTests.dll",
+    "test\GitHub.App.UnitTests\bin\$Configuration\net461\GitHub.App.UnitTests.dll",
+    "test\GitHub.Exports.Reactive.UnitTests\bin\$Configuration\net461\GitHub.Exports.Reactive.UnitTests.dll",
+    "test\GitHub.Exports.UnitTests\bin\$Configuration\net461\GitHub.Exports.UnitTests.dll",
+    "test\GitHub.Extensions.UnitTests\bin\$Configuration\net461\GitHub.Extensions.UnitTests.dll",
+    "test\GitHub.InlineReviews.UnitTests\bin\$Configuration\net461\GitHub.InlineReviews.UnitTests.dll",
+    "test\GitHub.TeamFoundation.UnitTests\bin\$Configuration\net461\GitHub.TeamFoundation.UnitTests.dll",
+    "test\GitHub.UI.UnitTests\bin\$Configuration\net461\GitHub.UI.UnitTests.dll",
+    "test\GitHub.VisualStudio.UnitTests\bin\$Configuration\net461\GitHub.VisualStudio.UnitTests.dll",
     "test\MetricsTests\MetricsTests\bin\$Configuration\MetricsTests.dll",
-    "test\TrackingCollectionTests\bin\$Configuration\TrackingCollectionTests.dll"
+    "test\TrackingCollectionTests\bin\$Configuration\net461\TrackingCollectionTests.dll"
 )
 
 $opencoverTargetArgs = ($testAssemblies -join " ") + " --where \`"cat!=Timings and cat!=CodeCoverageFlake\`" --inprocess --noresult"
@@ -52,18 +51,19 @@ $codecovArgs = "-f $rootDirectory\coverage.xml"
 
 & {
     Trap {
-        Write-Output "$Project tests failed"
+        Write-Output "Code coverage failed"
         exit 0
     }
 
     Run-Process 600 $opencover $opencoverArgs
 
     if($AppVeyor) {
-        Run-Process 60 $codecov $codecovArgs
+        Push-AppveyorArtifact "$rootDirectory\coverage.xml"
+        Run-Process 300 $codecov $codecovArgs
     }
 
     if (!$?) {
-        Write-Output "$Project tests failed"
+        Write-Output "Code coverage failed"
         exit 0
     }
 }

src/CredentialManagement/CredentialManagement.csproj

@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\src\common\signing.props" />
   <ItemGroup>

src/GitHub.Api/ApiClientConfiguration.cs

@@ -33,9 +33,14 @@ static ApiClientConfiguration()
         public static string ClientSecret { get; private set; }
 
         /// <summary>
-        /// Gets the scopes required by the application.
+        /// Gets the minimum scopes required by the application.
         /// </summary>
-        public static IReadOnlyList<string> RequiredScopes { get; } = new[] { "user", "repo", "gist", "write:public_key" };
+        public static IReadOnlyList<string> MinimumScopes { get; } = new[] { "user", "repo", "gist", "write:public_key" };
+
+        /// <summary>
+        /// Gets the ideal scopes requested by the application.
+        /// </summary>
+        public static IReadOnlyList<string> RequestedScopes { get; } = new[] { "user", "repo", "gist", "write:public_key", "read:org" };
 
         /// <summary>
         /// Gets a note that will be stored with the OAUTH token.

src/GitHub.Api/GitHub.Api.csproj

@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
   <Import Project="$(SolutionDir)\src\common\signing.props" />

src/GitHub.Api/ILoginManager.cs

@@ -21,11 +21,11 @@ public interface ILoginManager
         /// <param name="client">An octokit client configured to access the server.</param>
         /// <param name="userName">The username.</param>
         /// <param name="password">The password.</param>
-        /// <returns>The logged in user.</returns>
+        /// <returns>A <see cref="LoginResult"/> with the details of the successful login.</returns>
         /// <exception cref="AuthorizationException">
         /// The login authorization failed.
         /// </exception>
-        Task<User> Login(HostAddress hostAddress, IGitHubClient client, string userName, string password);
+        Task<LoginResult> Login(HostAddress hostAddress, IGitHubClient client, string userName, string password);
 
         /// <summary>
         /// Attempts to log into a GitHub server via OAuth in the browser.
@@ -35,11 +35,11 @@ public interface ILoginManager
         /// <param name="oauthClient">An octokit OAuth client configured to access the server.</param>
         /// <param name="openBrowser">A callback that should open a browser at the requested URL.</param>
         /// <param name="cancel">A cancellation token used to cancel the operation.</param>
-        /// <returns>The logged in user.</returns>
+        /// <returns>A <see cref="LoginResult"/> with the details of the successful login.</returns>
         /// <exception cref="AuthorizationException">
         /// The login authorization failed.
         /// </exception>
-        Task<User> LoginViaOAuth(
+        Task<LoginResult> LoginViaOAuth(
             HostAddress hostAddress,
             IGitHubClient client,
             IOauthClient oauthClient,
@@ -52,7 +52,8 @@ Task<User> LoginViaOAuth(
         /// <param name="hostAddress">The address of the server.</param>
         /// <param name="client">An octokit client configured to access the server.</param>
         /// <param name="token">The token.</param>
-        Task<User> LoginWithToken(
+        /// <returns>A <see cref="LoginResult"/> with the details of the successful login.</returns>
+        Task<LoginResult> LoginWithToken(
             HostAddress hostAddress,
             IGitHubClient client,
             string token);
@@ -62,11 +63,11 @@ Task<User> LoginWithToken(
         /// </summary>
         /// <param name="hostAddress">The address of the server.</param>
         /// <param name="client">An octokit client configured to access the server.</param>
-        /// <returns>The logged in user.</returns>
+        /// <returns>A <see cref="LoginResult"/> with the details of the successful login.</returns>
         /// <exception cref="AuthorizationException">
         /// The login authorization failed.
         /// </exception>
-        Task<User> LoginFromCache(HostAddress hostAddress, IGitHubClient client);
+        Task<LoginResult> LoginFromCache(HostAddress hostAddress, IGitHubClient client);
 
         /// <summary>
         /// Logs out of GitHub server.