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

Commit 320a5b1

Browse files
laurentkempelaurentkempe
committed
Merge branch 'master' into fixes/1666-filter-pr-solution-explorer
2 parents a5513c5 + 4522d91 commit 320a5b1

File tree

200 files changed

+3089
-1477
lines changed

Some content is hidden

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

200 files changed

+3089
-1477
lines changed

Diff for: ‎.gitignore

+3
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

Diff for: ‎Directory.Build.Props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<Product>GitHub Extension for Visual Studio</Product>
4-
<Version>2.5.7.0</Version>
4+
<Version>2.5.9.0</Version>
55
<Copyright>Copyright © GitHub, Inc. 2014-2018</Copyright>
66
<LangVersion>7.3</LangVersion>
77
</PropertyGroup>

Diff for: ‎GitHubVS.sln

+96-68
Large diffs are not rendered by default.

Diff for: ‎appveyor.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
os: Visual Studio 2017
2-
version: '2.5.7.{build}'
2+
version: '2.5.9.{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%"

Diff for: ‎codecov.yml

+8-3
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:
@@ -21,9 +21,14 @@ parsers:
2121
macro: no
2222

2323
comment:
24-
layout: "header, reach, diff, files"
25-
behavior: new
24+
layout: "header, diff, files"
25+
behavior: once
2626
require_changes: no
2727

2828
fixes:
2929
- "/C/projects/visualstudio/::"
30+
31+
ignore:
32+
- "*.xaml"
33+
- "*.xaml.cs"
34+
- "**/SampleData/*"

Diff for: ‎lib/BCC-MSBuildLog.0.0.2-alpha.nupkg

7.41 MB
Binary file not shown.

Diff for: ‎lib/BCC-Submission.0.0.2-alpha.nupkg

1.13 MB
Binary file not shown.

Diff for: ‎lib/Rx-Core.2.2.5-custom.nupkg

-123 KB
Binary file not shown.

Diff for: ‎lib/Rx-Interfaces.2.2.5-custom.nupkg

-16.1 KB
Binary file not shown.

Diff for: ‎lib/Rx-Linq.2.2.5-custom.nupkg

-514 KB
Binary file not shown.

Diff for: ‎lib/Rx-Main.2.2.5-custom.nupkg

-2.68 KB
Binary file not shown.

Diff for: ‎lib/Rx-PlatformServices.2.2.5-custom.nupkg

-28.5 KB
Binary file not shown.

Diff for: ‎lib/Rx-Testing.2.2.5-custom.nupkg

-14.5 KB
Binary file not shown.

Diff for: ‎lib/Rx-XAML.2.2.5-custom.nupkg

-10.9 KB
Binary file not shown.

Diff for: ‎scripts/Run-CodeCoverage.ps1

+35-20
Original file line numberDiff line numberDiff line change
@@ -20,49 +20,64 @@ $nunitDirectory = Join-Path $rootDirectory packages\NUnit.ConsoleRunner.3.7.0\to
2020
$nunitConsoleRunner = Join-Path $nunitDirectory nunit3-console.exe
2121

2222
$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",
23+
"test\GitHub.Api.UnitTests\bin\$Configuration\net461\GitHub.Api.UnitTests.dll",
24+
"test\GitHub.App.UnitTests\bin\$Configuration\net461\GitHub.App.UnitTests.dll",
25+
"test\GitHub.Exports.Reactive.UnitTests\bin\$Configuration\net461\GitHub.Exports.Reactive.UnitTests.dll",
26+
"test\GitHub.Exports.UnitTests\bin\$Configuration\net461\GitHub.Exports.UnitTests.dll",
27+
"test\GitHub.Extensions.UnitTests\bin\$Configuration\net461\GitHub.Extensions.UnitTests.dll",
28+
"test\GitHub.InlineReviews.UnitTests\bin\$Configuration\net461\GitHub.InlineReviews.UnitTests.dll",
29+
"test\GitHub.TeamFoundation.UnitTests\bin\$Configuration\net461\GitHub.TeamFoundation.UnitTests.dll",
30+
"test\GitHub.UI.UnitTests\bin\$Configuration\net461\GitHub.UI.UnitTests.dll",
31+
"test\GitHub.VisualStudio.UnitTests\bin\$Configuration\net461\GitHub.VisualStudio.UnitTests.dll",
3332
"test\MetricsTests\MetricsTests\bin\$Configuration\MetricsTests.dll",
34-
"test\TrackingCollectionTests\bin\$Configuration\TrackingCollectionTests.dll"
33+
"test\TrackingCollectionTests\bin\$Configuration\net461\TrackingCollectionTests.dll"
3534
)
3635

3736
$opencoverTargetArgs = ($testAssemblies -join " ") + " --where \`"cat!=Timings and cat!=CodeCoverageFlake\`" --inprocess --noresult"
3837

39-
$opencoverDirectory = Join-Path $rootDirectory packages\OpenCover.4.6.519\tools
38+
$opencoverDirectory = Join-Path $env:USERPROFILE .nuget\packages\opencover\4.6.519\tools
4039
$opencover = Join-Path $opencoverDirectory OpenCover.Console.exe
4140
$opencoverArgs = @(
4241
"-target:`"$nunitConsoleRunner`"",
4342
"-targetargs:`"$opencoverTargetArgs`"",
44-
"-filter:`"+[GitHub*]* -[GitHub*UnitTests]*`"",
43+
"-filter:`"+[GitHub*]* -[GitHub*Unit]GitHub.*.SampleData -[GitHub*UnitTests]*`"",
44+
"-excludebyfile:*.xaml;*.xaml.cs",
4545
"-register:user -output:$rootDirectory\coverage.xml"
4646
) -join " "
4747

48-
$codecovDirectory = Join-Path $rootDirectory packages\Codecov.1.0.5\tools
48+
$codecovDirectory = Join-Path $env:USERPROFILE .nuget\packages\codecov\1.1.0\tools
4949
$codecov = Join-Path $codecovDirectory codecov.exe
5050
$codecovArgs = "-f $rootDirectory\coverage.xml"
5151

5252
& {
5353
Trap {
54-
Write-Output "$Project tests failed"
54+
Write-Output "OpenCover trapped"
5555
exit 0
5656
}
5757

58-
Run-Process 600 $opencover $opencoverArgs
58+
Write-Output $opencover
5959

60-
if($AppVeyor) {
61-
Run-Process 60 $codecov $codecovArgs
62-
}
60+
Run-Process 600 $opencover $opencoverArgs
6361

6462
if (!$?) {
65-
Write-Output "$Project tests failed"
63+
Write-Output "OpenCover failed"
6664
exit 0
6765
}
6866
}
67+
68+
if($AppVeyor) {
69+
& {
70+
Trap {
71+
Write-Output "Codecov trapped"
72+
exit 0
73+
}
74+
75+
Push-AppveyorArtifact "$rootDirectory\coverage.xml"
76+
Run-Process 300 $codecov $codecovArgs
77+
78+
if (!$?) {
79+
Write-Output "Codecov failed"
80+
exit 0
81+
}
82+
}
83+
}

Diff for: ‎scripts/modules.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ New-Module -ScriptBlock {
129129

130130
$msbuild = Find-MSBuild
131131

132-
Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 $flag1 $flag2"
133-
Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 $flag1 $flag2 }
132+
Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 /bl:output.binlog $flag1 $flag2"
133+
Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 /bl:output.binlog $flag1 $flag2 }
134134
}
135135

136136
Export-ModuleMember -Function Find-MSBuild,Build-Solution

Diff for: ‎src/CredentialManagement/CredentialManagement.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net461</TargetFramework>
4+
<DebugType>full</DebugType>
5+
<DebugSymbols>true</DebugSymbols>
46
</PropertyGroup>
57
<Import Project="$(SolutionDir)\src\common\signing.props" />
68
<ItemGroup>

Diff for: ‎src/GitHub.Api/GitHub.Api.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net461</TargetFramework>
4+
<DebugType>full</DebugType>
5+
<DebugSymbols>true</DebugSymbols>
46
</PropertyGroup>
57

68
<Import Project="$(SolutionDir)\src\common\signing.props" />
@@ -27,7 +29,7 @@
2729

2830
<ItemGroup>
2931
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
30-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
32+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
3133
<PackageReference Include="Octokit.GraphQL" Version="0.1.1-beta" />
3234
</ItemGroup>
3335
</Project>

Diff for: ‎src/GitHub.Api/LoginManager.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ public async Task<LoginResult> Login(
115115
// be using a personal access token as the password.
116116
if (EnterpriseWorkaround(hostAddress, e))
117117
{
118-
auth = new ApplicationAuthorization(password);
118+
auth = new ApplicationAuthorization(0,
119+
null, null, null, null, null, null, null,
120+
DateTimeOffset.MinValue, DateTimeOffset.MinValue, null, password);
119121
}
120122
else
121123
{

Diff for: ‎src/GitHub.App/Authentication/TwoFactorRequiredUserError.cs

+3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
using GitHub.Extensions;
33
using Octokit;
44
using ReactiveUI;
5+
using ReactiveUI.Legacy;
56

67
namespace GitHub.Authentication
78
{
9+
#pragma warning disable CS0618 // Type or member is obsolete
810
public class TwoFactorRequiredUserError : UserError
911
{
1012
public TwoFactorRequiredUserError(TwoFactorAuthorizationException exception)
@@ -32,4 +34,5 @@ public IObservable<RecoveryOptionResult> Throw()
3234
return Throw(this);
3335
}
3436
}
37+
#pragma warning restore CS0618 // Type or member is obsolete
3538
}

Diff for: ‎src/GitHub.App/GitHub.App.csproj

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net461</TargetFramework>
4+
<DebugType>full</DebugType>
5+
<DebugSymbols>true</DebugSymbols>
46
</PropertyGroup>
57

68
<Import Project="$(SolutionDir)\src\common\signing.props" />
@@ -21,12 +23,10 @@
2123
</ItemGroup>
2224

2325
<ItemGroup>
24-
<ProjectReference Include="..\..\submodules\akavache\Akavache.Sqlite3\Akavache.Sqlite3.csproj" />
25-
<ProjectReference Include="..\..\submodules\akavache\Akavache\Akavache_Net45.csproj" />
26+
<ProjectReference Include="..\..\submodules\akavache\src\Akavache.Sqlite3\Akavache.Sqlite3.csproj" />
27+
<ProjectReference Include="..\..\submodules\akavache\src\Akavache.Core\Akavache.Core.csproj" />
2628
<ProjectReference Include="..\..\submodules\octokit.net\Octokit.Reactive\Octokit.Reactive.csproj" />
2729
<ProjectReference Include="..\..\submodules\octokit.net\Octokit\Octokit.csproj" />
28-
<ProjectReference Include="..\..\submodules\reactiveui\ReactiveUI\ReactiveUI_Net45.csproj" />
29-
<ProjectReference Include="..\..\submodules\splat\Splat\Splat-Net45.csproj" />
3030
<ProjectReference Include="..\CredentialManagement\CredentialManagement.csproj" />
3131
<ProjectReference Include="..\GitHub.Api\GitHub.Api.csproj" />
3232
<ProjectReference Include="..\GitHub.Exports.Reactive\GitHub.Exports.Reactive.csproj" />
@@ -48,13 +48,11 @@
4848
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="14.3.25407" />
4949
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.17" />
5050
<PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" />
51-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
51+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
5252
<PackageReference Include="Octokit.GraphQL" Version="0.1.1-beta" />
5353
<PackageReference Include="Rothko" Version="0.0.3-ghfvs" />
54-
<PackageReference Include="Rx-Main" Version="2.2.5-custom" targetFramework="net45" />
5554
<PackageReference Include="Serilog" Version="2.5.0" />
5655
<PackageReference Include="SerilogAnalyzer" Version="0.12.0.0" />
57-
<PackageReference Include="SQLitePCL.raw_basic" Version="0.7.3.0-vs2012" targetFramework="net45" />
5856
<PackageReference Include="Stateless" Version="2.5.56.0" targetFramework="net45" />
5957
</ItemGroup>
6058
</Project>

Diff for: ‎src/GitHub.App/SampleData/CommentThreadViewModelDesigner.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Collections.ObjectModel;
1+
using System;
2+
using System.Collections.ObjectModel;
23
using System.Diagnostics.CodeAnalysis;
34
using System.Reactive;
45
using GitHub.ViewModels;
@@ -15,8 +16,8 @@ public class CommentThreadViewModelDesigner : ICommentThreadViewModel
1516
public IActorViewModel CurrentUser { get; set; }
1617
= new ActorViewModel { Login = "shana" };
1718

18-
public ReactiveCommand<Unit> PostComment { get; }
19-
public ReactiveCommand<Unit> EditComment { get; }
20-
public ReactiveCommand<Unit> DeleteComment { get; }
19+
public ReactiveCommand<string, Unit> PostComment { get; }
20+
public ReactiveCommand<Tuple<string, string>, Unit> EditComment { get; }
21+
public ReactiveCommand<Tuple<int, int>, Unit> DeleteComment { get; }
2122
}
2223
}

Diff for: ‎src/GitHub.App/SampleData/CommentViewModelDesigner.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ public CommentViewModelDesigner()
2828
public IActorViewModel Author { get; set; }
2929
public Uri WebUrl { get; }
3030

31-
public ReactiveCommand<object> BeginEdit { get; }
32-
public ReactiveCommand<object> CancelEdit { get; }
33-
public ReactiveCommand<Unit> CommitEdit { get; }
34-
public ReactiveCommand<object> OpenOnGitHub { get; }
35-
public ReactiveCommand<Unit> Delete { get; }
31+
public ReactiveCommand<Unit, Unit> BeginEdit { get; }
32+
public ReactiveCommand<Unit, Unit> CancelEdit { get; }
33+
public ReactiveCommand<Unit, Unit> CommitEdit { get; }
34+
public ReactiveCommand<Unit, Unit> OpenOnGitHub { get; }
35+
public ReactiveCommand<Unit, Unit> Delete { get; }
3636
}
3737
}

Diff for: ‎src/GitHub.App/SampleData/Dialog/Clone/RepositoryCloneViewModelDesigner.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Reactive;
23
using System.Threading.Tasks;
34
using GitHub.Models;
45
using GitHub.ViewModels;
@@ -23,8 +24,8 @@ public RepositoryCloneViewModelDesigner()
2324
public IRepositorySelectViewModel GitHubTab { get; }
2425
public IRepositorySelectViewModel EnterpriseTab { get; }
2526
public IRepositoryUrlViewModel UrlTab { get; }
26-
public ReactiveCommand<object> Browse { get; }
27-
public ReactiveCommand<CloneDialogResult> Clone { get; }
27+
public ReactiveCommand<Unit, Unit> Browse { get; }
28+
public ReactiveCommand<Unit, CloneDialogResult> Clone { get; }
2829

2930
public Task InitializeAsync(IConnection connection)
3031
{

Diff for: ‎src/GitHub.App/SampleData/ForkRepositoryExecuteViewModelDesigner.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Reactive;
23
using System.Threading.Tasks;
34
using GitHub.Models;
45
using GitHub.ViewModels;
@@ -30,7 +31,7 @@ public ForkRepositoryExecuteViewModelDesigner()
3031

3132
public IObservable<object> Done => null;
3233

33-
public IObservable<object> Back => null;
34+
public IObservable<Unit> Back => null;
3435

3536
public string Title => null;
3637

@@ -40,9 +41,9 @@ public ForkRepositoryExecuteViewModelDesigner()
4041

4142
public IAccount DestinationAccount { get; }
4243

43-
public IReactiveCommand<Repository> CreateFork => null;
44+
public ReactiveCommand<Unit, Repository> CreateFork => null;
4445

45-
public IReactiveCommand<object> BackCommand => null;
46+
public ReactiveCommand<Unit, Unit> BackCommand => null;
4647

4748
public bool ResetMasterTracking { get; set; } = true;
4849

Diff for: ‎src/GitHub.App/SampleData/ForkRepositorySelectViewModelDesigner.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Reactive;
34
using System.Threading.Tasks;
45
using GitHub.Models;
56
using GitHub.ViewModels;
@@ -38,9 +39,9 @@ public ForkRepositorySelectViewModelDesigner()
3839

3940
public string Title => null;
4041

41-
public ReactiveCommand<object> SelectedAccount => null;
42+
public ReactiveCommand<IAccount, Unit> SelectedAccount => null;
4243

43-
public ReactiveCommand<object> SwitchOrigin => null;
44+
public ReactiveCommand<IRemoteRepositoryModel, Unit> SwitchOrigin => null;
4445

4546
public Task InitializeAsync(ILocalRepositoryModel repository, IConnection connection)
4647
{

Diff for: ‎src/GitHub.App/SampleData/ForkRepositorySwitchViewModelDesigner.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Reactive;
23
using GitHub.Models;
34
using GitHub.ViewModels;
45
using GitHub.ViewModels.Dialog;
@@ -32,7 +33,7 @@ public ForkRepositorySwitchViewModelDesigner()
3233

3334
public IRepositoryModel DestinationRepository { get; }
3435

35-
public IReactiveCommand<object> SwitchFork => null;
36+
public ReactiveCommand<Unit, Unit> SwitchFork => null;
3637

3738
public bool ResetMasterTracking { get; set; } = true;
3839

Diff for: ‎src/GitHub.App/SampleData/GitServiceDesigner.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace GitHub.SampleData
77
{
88
class GitServiceDesigner : IGitService
99
{
10-
public Task<string> GetLatestPushedSha(string path) => Task.FromResult<string>(null);
10+
public Task<string> GetLatestPushedSha(string path, string remote = "origin") => Task.FromResult<string>(null);
1111
public UriString GetRemoteUri(IRepository repo, string remote = "origin") => null;
1212
public IRepository GetRepository(string path) => null;
1313
public UriString GetUri(string path, string remote = "origin") => null;

Diff for: ‎src/GitHub.App/SampleData/PullRequestCheckViewModelDesigner.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Reactive;
23
using System.Windows.Media.Imaging;
34
using GitHub.ViewModels;
45
using GitHub.ViewModels.GitHubPane;
@@ -16,6 +17,6 @@ public sealed class PullRequestCheckViewModelDesigner : ViewModelBase, IPullRequ
1617

1718
public Uri DetailsUrl { get; set; } = new Uri("http://github.com");
1819

19-
public ReactiveCommand<object> OpenDetailsUrl { get; set; } = null;
20+
public ReactiveCommand<Unit, Unit> OpenDetailsUrl { get; set; } = null;
2021
}
2122
}

0 commit comments

Comments
 (0)