Skip to content

Commit c8b0396

Browse files
authored
Fix to enable use of DynamicData 9.0 (#3875)
<!-- Please be sure to read the [Contribute](https://github.com/reactiveui/reactiveui#contribute) section of the README --> **What kind of change does this PR introduce?** <!-- Bug fix, feature, docs update, ... --> fix **What is the current behavior?** <!-- You can also link to an open issue here. --> ReactiveUI 20.1.1 includes DynamicData 8 DynamicData 9 has an update to the Observable Change Set which introduces a default value, this results in a mismatch in count between V8 and V9 **What is the new behavior?** <!-- If this is a feature change --> the default value has been removed from the RoutingState CurrentViewModel **What might this PR break?** Execution should match previous versions **Please check if the PR fulfills these requirements** - [ ] Tests for the changes have been added (for bug fixes / features) - [ ] Docs have been added / updated (for bug fixes / features) **Other information**:
1 parent 16cd48a commit c8b0396

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/Directory.Packages.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99
<ItemGroup>
1010
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
11-
<PackageVersion Include="DynamicData" Version="8.4.1" />
11+
<PackageVersion Include="DynamicData" Version="9.0.1" />
1212
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
1313
<PackageVersion Include="JetBrains.DotMemoryUnit" Version="3.2.20220510" />
1414
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />

src/ReactiveUI/Routing/RoutingState.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,6 @@ private void SetupRx()
125125
return Navigate.Execute(vm);
126126
});
127127

128-
CurrentViewModel = Observable.Defer(() => Observable.Return(NavigationStack.LastOrDefault()!)).Concat(NavigationChanged.Select(_ => NavigationStack.LastOrDefault()!));
128+
CurrentViewModel = NavigationChanged.Select(_ => NavigationStack.LastOrDefault()!);
129129
}
130130
}

0 commit comments

Comments
 (0)