Skip to content

Commit 916d1f7

Browse files
authored
Merge branch 'main' into renovate/dynamicdata-9.x
2 parents 0fef619 + 27e721a commit 916d1f7

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

integrationtests/IntegrationTests.XamarinForms.Android/IntegrationTests.XamarinForms.Android.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<Reference Include="System.Xml" />
5151
</ItemGroup>
5252
<ItemGroup>
53-
<PackageReference Include="Acr.UserDialogs" Version="9.0.0" />
53+
<PackageReference Include="Acr.UserDialogs" Version="9.1.0" />
5454
<PackageReference Include="Xamarin.AndroidX.Core">
5555
<Version>1.13.1.2</Version>
5656
</PackageReference>

integrationtests/IntegrationTests.XamarinForms.UWP/IntegrationTests.XamarinForms.UWP.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
</ItemGroup>
146146
<ItemGroup>
147147
<PackageReference Include="Acr.UserDialogs">
148-
<Version>9.0.0</Version>
148+
<Version>9.1.0</Version>
149149
</PackageReference>
150150
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.*" />
151151
</ItemGroup>

integrationtests/IntegrationTests.XamarinForms.iOS/IntegrationTests.XamarinForms.iOS.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
<Reference Include="Xamarin.iOS" />
161161
</ItemGroup>
162162
<ItemGroup>
163-
<PackageReference Include="Acr.UserDialogs" Version="9.0.0" />
163+
<PackageReference Include="Acr.UserDialogs" Version="9.1.0" />
164164
</ItemGroup>
165165
<ItemGroup>
166166
<ProjectReference Include="..\IntegrationTests.XamarinForms\IntegrationTests.XamarinForms.csproj">

integrationtests/IntegrationTests.XamarinForms/IntegrationTests.XamarinForms.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Acr.UserDialogs" Version="9.0.0" />
8+
<PackageReference Include="Acr.UserDialogs" Version="9.1.0" />
99
</ItemGroup>
1010

1111
<ItemGroup>

src/ReactiveUI/Routing/RoutingState.cs

Lines changed: 1 addition & 1 deletion
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)