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

Commit 56abda2

Browse files
grokysgrokys
authored
Merge branch 'master' into feature/pull-request-filtering
2 parents 715bb39 + 6c852c2 commit 56abda2

Some content is hidden

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

48 files changed

+705
-557
lines changed

‎src/GitHub.App/GitHub.App.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" />
3+
<Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -48,8 +48,8 @@
4848
</PropertyGroup>
4949
<Import Project="$(SolutionDir)\src\common\signing.props" />
5050
<ItemGroup>
51-
<Reference Include="LibGit2Sharp, Version=0.24.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
52-
<HintPath>..\..\packages\LibGit2Sharp.0.24.0\lib\net40\LibGit2Sharp.dll</HintPath>
51+
<Reference Include="LibGit2Sharp, Version=0.23.1.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
52+
<HintPath>..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
5555
<Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -320,7 +320,7 @@
320320
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
321321
</PropertyGroup>
322322
<Error Condition="!Exists('..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets'))" />
323-
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props'))" />
323+
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props'))" />
324324
</Target>
325325
<Import Project="..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets" Condition="Exists('..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets')" />
326326
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/GitHub.App/Models/RepositoryHost.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ public IObservable<AuthenticationResult> LogInFromCache()
7676
{
7777
var user = await loginManager.LoginFromCache(Address, ApiClient.GitHubClient);
7878
var accountCacheItem = new AccountCacheItem(user);
79-
usage.IncrementLoginCount().Forget();
79+
80+
await usage.IncrementCounter(x => x.NumberOfLogins);
8081
await ModelService.InsertUser(accountCacheItem);
8182

8283
if (user != null)
@@ -107,7 +108,8 @@ public IObservable<AuthenticationResult> LogIn(string usernameOrEmail, string pa
107108
{
108109
var user = await loginManager.Login(Address, ApiClient.GitHubClient, usernameOrEmail, password);
109110
var accountCacheItem = new AccountCacheItem(user);
110-
usage.IncrementLoginCount().Forget();
111+
112+
await usage.IncrementCounter(x => x.NumberOfLogins);
111113
await ModelService.InsertUser(accountCacheItem);
112114

113115
if (user != null)

‎src/GitHub.App/Services/PullRequestService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ async Task<IPullRequestModel> PushAndCreatePR(IRepositoryHost host,
537537
await Task.Delay(TimeSpan.FromSeconds(5));
538538

539539
var ret = await host.ModelService.CreatePullRequest(sourceRepository, targetRepository, sourceBranch, targetBranch, title, body);
540-
await usageTracker.IncrementUpstreamPullRequestCount();
540+
await usageTracker.IncrementCounter(x => x.NumberOfUpstreamPullRequests);
541541
return ret;
542542
}
543543

‎src/GitHub.App/Services/RepositoryCloneService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public async Task CloneRepository(
6464
try
6565
{
6666
await vsGitServices.Clone(cloneUrl, path, true, progress);
67-
await usageTracker.IncrementCloneCount();
67+
await usageTracker.IncrementCounter(x => x.NumberOfClones);
6868
}
6969
catch (Exception ex)
7070
{

‎src/GitHub.App/ViewModels/GistCreationViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ IObservable<Gist> OnCreateGist(object unused)
9191
newGist.Files.Add(FileName, SelectedText);
9292

9393
return gistPublishService.PublishGist(apiClient, newGist)
94-
.Do(_ => usageTracker.IncrementCreateGistCount().Forget())
94+
.Do(_ => usageTracker.IncrementCounter(x => x.NumberOfGists).Forget())
9595
.Catch<Gist, Exception>(ex =>
9696
{
9797
if (!ex.IsCriticalException())

‎src/GitHub.App/ViewModels/PullRequestDetailViewModel.cs‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ public async Task Load(string remoteRepositoryOwner, IPullRequestModel pullReque
454454

455455
if (firstLoad)
456456
{
457-
usageTracker.IncrementPullRequestOpened().Forget();
457+
usageTracker.IncrementCounter(x => x.NumberOfPullRequestsOpened).Forget();
458458
}
459459

460460
if (!isInCheckout)
@@ -604,19 +604,37 @@ IObservable<Unit> DoCheckout(object unused)
604604
.GetDefaultLocalBranchName(LocalRepository, Model.Number, Model.Title)
605605
.SelectMany(x => pullRequestsService.Checkout(LocalRepository, Model, x));
606606
}
607-
}).Do(_ => usageTracker.IncrementPullRequestCheckOutCount(IsFromFork).Forget());
607+
}).Do(_ =>
608+
{
609+
if (IsFromFork)
610+
usageTracker.IncrementCounter(x => x.NumberOfForkPullRequestsCheckedOut).Forget();
611+
else
612+
usageTracker.IncrementCounter(x => x.NumberOfLocalPullRequestsCheckedOut).Forget();
613+
});
608614
}
609615

610616
IObservable<Unit> DoPull(object unused)
611617
{
612618
return pullRequestsService.Pull(LocalRepository)
613-
.Do(_ => usageTracker.IncrementPullRequestPullCount(IsFromFork).Forget());
619+
.Do(_ =>
620+
{
621+
if (IsFromFork)
622+
usageTracker.IncrementCounter(x => x.NumberOfForkPullRequestPulls).Forget();
623+
else
624+
usageTracker.IncrementCounter(x => x.NumberOfLocalPullRequestPulls).Forget();
625+
});
614626
}
615627

616628
IObservable<Unit> DoPush(object unused)
617629
{
618630
return pullRequestsService.Push(LocalRepository)
619-
.Do(_ => usageTracker.IncrementPullRequestPushCount(IsFromFork).Forget());
631+
.Do(_ =>
632+
{
633+
if (IsFromFork)
634+
usageTracker.IncrementCounter(x => x.NumberOfForkPullRequestPushes).Forget();
635+
else
636+
usageTracker.IncrementCounter(x => x.NumberOfLocalPullRequestPushes).Forget();
637+
});
620638
}
621639

622640
class CheckoutCommandState : IPullRequestCheckoutState

‎src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ IObservable<Unit> OnCreateRepository(object state)
273273
SelectedAccount,
274274
BaseRepositoryPath,
275275
repositoryHost.ApiClient)
276-
.Do(_ => usageTracker.IncrementCreateCount().Forget());
276+
.Do(_ => usageTracker.IncrementCounter(x => x.NumberOfReposCreated).Forget());
277277
}
278278

279279
ReactiveCommand<Unit> InitializeCreateRepositoryCommand()

‎src/GitHub.App/ViewModels/RepositoryPublishViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ IObservable<ProgressState> OnPublishRepository(object arg)
159159
var account = SelectedAccount;
160160

161161
return repositoryPublishService.PublishRepository(newRepository, account, SelectedHost.ApiClient)
162-
.Do(_ => usageTracker.IncrementPublishCount().Forget())
162+
.Do(_ => usageTracker.IncrementCounter(x => x.NumberOfReposPublished).Forget())
163163
.Select(_ => ProgressState.Success)
164164
.Catch<ProgressState, Exception>(ex =>
165165
{

‎src/GitHub.App/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="LibGit2Sharp" version="0.24.0" targetFramework="net461" />
4-
<package id="LibGit2Sharp.NativeBinaries" version="1.0.185" targetFramework="net461" />
3+
<package id="LibGit2Sharp" version="0.23.1" targetFramework="net461" />
4+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.164" targetFramework="net461" />
55
<package id="Microsoft.VisualStudio.ComponentModelHost" version="14.0.25424" targetFramework="net461" />
66
<package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net461" />
77
<package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net461" />

‎src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" />
3+
<Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -47,8 +47,8 @@
4747
</PropertyGroup>
4848
<Import Project="$(SolutionDir)\src\common\signing.props" />
4949
<ItemGroup>
50-
<Reference Include="LibGit2Sharp, Version=0.24.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
51-
<HintPath>..\..\packages\LibGit2Sharp.0.24.0\lib\net40\LibGit2Sharp.dll</HintPath>
50+
<Reference Include="LibGit2Sharp, Version=0.23.1.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
51+
<HintPath>..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
5454
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -214,7 +214,7 @@
214214
<PropertyGroup>
215215
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
216216
</PropertyGroup>
217-
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props'))" />
217+
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props'))" />
218218
</Target>
219219
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
220220
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)