Skip to content

Commit a62eeb1

Browse files
authored
Upgrade deps, fix several broken tests on main (#2403)
1 parent d8a31ae commit a62eeb1

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

Diff for: Directory.Packages.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<PrivateAssets>all</PrivateAssets>
106106
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
107107
</PackageVersion>
108-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
108+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
109109
<PackageVersion Include="NSubstitute" Version="5.3.0" />
110110
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
111111
<PrivateAssets>all</PrivateAssets>
@@ -128,7 +128,7 @@
128128
<PackageVersion Include="BitFaster.Caching" Version="2.5.2" />
129129
<PackageVersion Include="CliWrap" Version="3.6.7" />
130130
<PackageVersion Include="DynamicData" Version="9.0.4" />
131-
<PackageVersion Include="GameFinder" Version="4.3.3" />
131+
<PackageVersion Include="GameFinder" Version="4.4.0" />
132132
<PackageVersion Include="Humanizer" Version="2.14.1" />
133133
<PackageVersion Include="ini-parser-netstandard" Version="2.5.2" />
134134
<PackageVersion Include="Mutagen.Bethesda.Skyrim" Version="0.44.0" />

Diff for: src/Abstractions/NexusMods.Abstractions.Collections/Json/ModSourceType.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ public enum ModSourceType
2424
/// <summary>
2525
/// Downloaded externally via an URL.
2626
/// </summary>
27-
[JsonStringEnumMemberName("Browse")]
27+
[JsonStringEnumMemberName("browse")]
2828
Browse,
2929

3030
/// <summary>
3131
/// Downloaded externally via an URL.
3232
/// </summary>
33-
[JsonStringEnumMemberName("Direct")]
33+
[JsonStringEnumMemberName("direct")]
3434
Direct,
3535
}

Diff for: src/Networking/NexusMods.Networking.NexusWebApi/LoginManager.cs

+3-5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public sealed class LoginManager : IDisposable, ILoginManager
3232
public Observable<UserInfo?> UserInfoObservable => _userInfo;
3333

3434
/// <inheritdoc/>
35-
public UserInfo? UserInfo { get; private set; }
35+
public UserInfo? UserInfo => _cachedUserInfo.Get();
3636

3737
private readonly IDisposable _observeDatomDisposable;
3838

@@ -61,18 +61,16 @@ public LoginManager(
6161
.DistinctUntilChanged()
6262
.SubscribeAwait(async (hasValue, cancellationToken) =>
6363
{
64-
_cachedUserInfo.Evict();
65-
6664
if (!hasValue)
6765
{
66+
_cachedUserInfo.Evict();
6867
_userInfo.OnNext(value: null);
69-
UserInfo = null;
7068
}
7169
else
7270
{
7371
var userInfo = await Verify(cancellationToken);
72+
_cachedUserInfo.Store(userInfo);
7473
_userInfo.OnNext(userInfo);
75-
UserInfo = userInfo;
7674
}
7775
}, awaitOperation: AwaitOperation.Sequential, configureAwait: false);
7876
}

Diff for: tests/NexusMods.Collections.Tests/CollectionInstallTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public async Task CanInstallCollections(string slug, int revisionNumber)
3232
var loginManager = ServiceProvider.GetRequiredService<ILoginManager>();
3333
_ = await loginManager.GetUserInfoAsync();
3434

35+
loginManager.UserInfo.Should().NotBeNull(because: "this test requires a logged in user");
3536
loginManager.IsPremium.Should().BeTrue(because: "this test requires premium to automatically download mods");
3637

3738
await using var destination = TemporaryFileManager.CreateFile();

Diff for: tests/NexusMods.StandardGameLocators.TestHelpers/Services.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static IServiceCollection AddStubbedGameLocators(this IServiceCollection
4242

4343
coll.AddSingleton<AHandler<GOGGame, GOGGameId>>(s =>
4444
new StubbedGameLocator<GOGGame, GOGGameId>(s.GetRequiredService<TemporaryFileManager>(),
45-
tfm => new GOGGame(GOGGameId.From(42), "Stubbed Game", tfm.CreateFolder("gog_game").Path),
45+
tfm => new GOGGame(GOGGameId.From(42), "Stubbed Game", tfm.CreateFolder("gog_game").Path, "4242"),
4646
game => game.Id));
4747

4848
coll.AddSingleton<AHandler<SteamGame, AppId>>(s =>

0 commit comments

Comments
 (0)