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

Commit e9ec1e0

Browse files
authored
Merge pull request #1970 from github/update-rx
Updating submodule dependencies.
2 parents 7c3070a + 7c3c393 commit e9ec1e0

File tree

170 files changed

+2566
-1333
lines changed

Some content is hidden

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

170 files changed

+2566
-1333
lines changed

GitHubVS.sln

Lines changed: 94 additions & 68 deletions
Large diffs are not rendered by default.

lib/Rx-Core.2.2.5-custom.nupkg

-123 KB
Binary file not shown.
-16.1 KB
Binary file not shown.

lib/Rx-Linq.2.2.5-custom.nupkg

-514 KB
Binary file not shown.

lib/Rx-Main.2.2.5-custom.nupkg

-2.68 KB
Binary file not shown.
-28.5 KB
Binary file not shown.

lib/Rx-Testing.2.2.5-custom.nupkg

-14.5 KB
Binary file not shown.

lib/Rx-XAML.2.2.5-custom.nupkg

-10.9 KB
Binary file not shown.

src/GitHub.Api/LoginManager.cs

Lines changed: 3 additions & 1 deletion
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
{

src/GitHub.App/Authentication/TwoFactorRequiredUserError.cs

Lines changed: 3 additions & 0 deletions
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
}

0 commit comments

Comments
 (0)