Skip to content

Commit f72c9ab

Browse files
dansiegeldansiegel
authored
Merge pull request #3013 from PrismLibrary/dev/ds/uno-configure-window
2 parents 6bd895d + 3d214f4 commit f72c9ab

File tree

11 files changed

+46
-29
lines changed

11 files changed

+46
-29
lines changed

Diff for: ‎Directory.Packages.props

+20-20
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,38 @@
1515
</ItemGroup>
1616
<!-- Uno -->
1717
<ItemGroup Condition=" $(IsUnoProject) == 'true' ">
18-
<PackageVersion Include="Uno.WinUI" Version="5.0.19" />
19-
<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.0.19" />
20-
<PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="5.0.19" />
21-
<PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="5.0.19" />
22-
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.0" />
23-
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.0" />
24-
<PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.0.19" />
25-
<PackageVersion Include="Uno.WinUI.DevServer" Version="5.0.19" />
26-
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
18+
<PackageVersion Include="Uno.WinUI" Version="5.0.48" />
19+
<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.0.48" />
20+
<PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="5.0.48" />
21+
<PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="5.0.48" />
22+
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.4" />
23+
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.4" />
24+
<PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.0.48" />
25+
<PackageVersion Include="Uno.WinUI.DevServer" Version="5.0.48" />
26+
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.48" />
2727
<PackageVersion Include="Uno.Core" Version="4.0.1" />
2828
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
2929
<PackageVersion Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.4.2" />
3030
<PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
3131
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" Condition="$(MSBuildProjectName.Contains('Prism'))" />
32-
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" Condition="!$(MSBuildProjectName.Contains('Prism'))" />
32+
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" Condition="!$(MSBuildProjectName.Contains('Prism'))" />
3333
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
3434
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
3535
<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.6" />
36-
<PackageVersion Include="Uno.Resizetizer" Version="1.2.0" />
36+
<PackageVersion Include="Uno.Resizetizer" Version="1.2.1" />
3737
<PackageVersion Include="Uno.Extensions.Core" Version="3.0.10" />
3838
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
39-
<PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="3.0.10" />
40-
<PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="3.0.10" />
39+
<PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="3.0.11" />
40+
<PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="3.0.11" />
4141
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
42-
<PackageVersion Include="Uno.Material.WinUI" Version="4.0.4" />
43-
<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="5.0.15" />
44-
<PackageVersion Include="Uno.Toolkit.WinUI" Version="5.0.15" />
45-
<PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="3.0.10" />
46-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
42+
<PackageVersion Include="Uno.Material.WinUI" Version="4.0.6" />
43+
<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="5.0.17" />
44+
<PackageVersion Include="Uno.Toolkit.WinUI" Version="5.0.17" />
45+
<PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="3.0.11" />
46+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
4747
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.10.0.1" />
4848
<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
49-
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.5" />
49+
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.0" />
5050
</ItemGroup>
5151
<!-- Tests -->
5252
<ItemGroup>
@@ -77,6 +77,6 @@
7777
<!-- Global Packages -->
7878
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
7979
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
80-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
80+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
8181
</ItemGroup>
8282
</Project>

Diff for: ‎e2e/Uno/HelloWorld.Mobile/HelloWorld.Mobile.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<PackageReference Include="Uno.Extensions.Logging.OSLog" />
3333
<PackageReference Include="Uno.Extensions.Logging.WinUI" />
3434
<PackageReference Include="Uno.Extensions.Logging.Serilog" />
35-
<PackageReference Include="Uno.Extensions.Core" />
3635
</ItemGroup>
3736
<Choose>
3837
<When Condition="$(IsAndroid)">

Diff for: ‎e2e/Uno/HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<PackageReference Include="Uno.Extensions.Hosting.WinUI" />
2121
<PackageReference Include="Uno.Extensions.Logging.WinUI" />
2222
<PackageReference Include="Uno.Extensions.Logging.Serilog" />
23-
<PackageReference Include="Uno.Extensions.Core" />
2423
</ItemGroup>
2524
<ItemGroup>
2625
<ProjectReference Include="..\HelloWorld\HelloWorld.csproj" />

Diff for: ‎e2e/Uno/HelloWorld.Skia.Linux.FrameBuffer/HelloWorld.Skia.Linux.FrameBuffer.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<PackageReference Include="Uno.Extensions.Hosting.WinUI" />
2121
<PackageReference Include="Uno.Extensions.Logging.WinUI" />
2222
<PackageReference Include="Uno.Extensions.Logging.Serilog" />
23-
<PackageReference Include="Uno.Extensions.Core" />
2423
</ItemGroup>
2524
<ItemGroup>
2625
<ProjectReference Include="..\HelloWorld\HelloWorld.csproj" />

Diff for: ‎e2e/Uno/HelloWorld.Skia.WPF/HelloWorld.Skia.WPF.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<PackageReference Include="Uno.Extensions.Hosting.WinUI" />
3030
<PackageReference Include="Uno.Extensions.Logging.WinUI" />
3131
<PackageReference Include="Uno.Extensions.Logging.Serilog" />
32-
<PackageReference Include="Uno.Extensions.Core" />
3332
</ItemGroup>
3433
<ItemGroup>
3534
<ApplicationDefinition Include="Wpf\App.xaml" XamlRuntime="Wpf" />

Diff for: ‎e2e/Uno/HelloWorld.Wasm/HelloWorld.Wasm.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" />
5757
<PackageReference Include="Uno.Extensions.Logging.WinUI" />
5858
<PackageReference Include="Uno.Extensions.Logging.Serilog" />
59-
<PackageReference Include="Uno.Extensions.Core" />
6059
</ItemGroup>
6160
<ItemGroup>
6261
<ProjectReference Include="..\HelloWorld\HelloWorld.csproj" />

Diff for: ‎e2e/Uno/HelloWorld.Windows/HelloWorld.Windows.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<PackageReference Include="Uno.Extensions.Hosting.WinUI" />
3636
<PackageReference Include="Uno.Extensions.Logging.WinUI" />
3737
<PackageReference Include="Uno.Extensions.Logging.Serilog" />
38-
<PackageReference Include="Uno.Extensions.Core" />
3938
</ItemGroup>
4039

4140
<ItemGroup>

Diff for: ‎e2e/Uno/HelloWorld/App.cs

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using HelloWorld.Views;
22
using ModuleA;
3+
using Uno.UI;
34

45
namespace HelloWorld;
56

@@ -35,6 +36,13 @@ protected override void ConfigureHost(IHostBuilder builder)
3536
});
3637
}
3738

39+
protected override void ConfigureWindow(Window window)
40+
{
41+
#if DEBUG
42+
window.EnableHotReload();
43+
#endif
44+
}
45+
3846
protected override void RegisterTypes(IContainerRegistry containerRegistry)
3947
{
4048
// Register types with the container or for Navigation

Diff for: ‎e2e/Uno/HelloWorld/HelloWorld.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
<ItemGroup>
1212
<PackageReference Include="Uno.WinUI" />
1313
<PackageReference Include="Uno.Resizetizer" />
14-
<PackageReference Include="Uno.Extensions.Core" />
1514
<PackageReference Include="Uno.Extensions.Logging.WinUI" />
1615
<PackageReference Include="Uno.Extensions.Logging.Serilog" />
1716
<PackageReference Include="Uno.Material.WinUI" />
1817
<PackageReference Include="Uno.Toolkit.WinUI.Material" />
1918
<PackageReference Include="Uno.Toolkit.WinUI" />
2019
<PackageReference Include="Uno.Extensions.Hosting.WinUI" />
2120
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
21+
<PackageReference Include="Uno.WinUI.DevServer" Condition=" $(Configuration) == 'Debug' " />
2222
</ItemGroup>
2323

2424
<Choose>

Diff for: ‎src/Maui/Prism.Maui/Navigation/PageNavigationService.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ protected virtual async Task ProcessNavigation(Page currentPage, Queue<string> s
345345

346346
animated = parameters.ContainsKey(KnownNavigationParameters.Animated) ?
347347
parameters.GetValue<bool>(KnownNavigationParameters.Animated) :
348-
pageParameters.ContainsKey(KnownNavigationParameters.Animated) ? pageParameters.GetValue<bool>(KnownNavigationParameters.Animated) : true;
348+
pageParameters.ContainsKey(KnownNavigationParameters.Animated) ? pageParameters.GetValue<bool>(KnownNavigationParameters.Animated) : true;
349349

350350
if (nextSegment == RemovePageSegment)
351351
{
@@ -837,7 +837,7 @@ async Task ConfigureTabbedPage(TabbedPage tabbedPage, string segment, INavigatio
837837
{
838838
var tabSegment = tabSegments[i];
839839
var child = CreatePageFromSegment(tabSegment);
840-
var childParameters = UriParsingHelper.GetSegmentParameters(tabSegment, parameters);
840+
var childParameters = UriParsingHelper.GetSegmentParameters(tabSegment, parameters);
841841
if (i == 0 && child is NavigationPage navPage)
842842
{
843843
navigationPage = navPage;

Diff for: ‎src/Uno/Prism.Uno/PrismApplicationBase.cs

+15
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,20 @@ protected virtual void ConfigureApp(IApplicationBuilder builder) { }
8888
/// <param name="builder">The <see cref="IHostBuilder" />.</param>
8989
protected virtual void ConfigureHost(IHostBuilder builder) { }
9090

91+
/// <summary>
92+
/// Provides an opportunity to initialize services or otherwise prepare the application Window.
93+
/// </summary>
94+
/// <param name="window">The primary application <see cref="Window"/></param>
95+
/// <example>
96+
/// protected override void ConfigureWindow(Window window)
97+
/// {
98+
/// #if DEBUG
99+
/// window.EnableHotReload();
100+
/// #endif
101+
/// }
102+
/// </example>
103+
protected virtual void ConfigureWindow(Window window) { }
104+
91105
/// <summary>
92106
/// Register Services with the <see cref="IServiceCollection" />.
93107
/// </summary>
@@ -104,6 +118,7 @@ protected virtual void ConfigureServices(IServiceCollection services) { }
104118
protected virtual void Initialize(IApplicationBuilder builder)
105119
{
106120
ConfigureApp(builder);
121+
ConfigureWindow(builder.Window);
107122
builder.Configure(ConfigureHost)
108123
.Configure(x => x.ConfigureServices(ConfigureServices)
109124
.UseServiceProviderFactory(new PrismServiceProviderFactory(_containerExtension)));

0 commit comments

Comments
 (0)