Movatterモバイル変換

Skip to content

PrismLibrary/PrismPublic

NotificationsYou must be signed in to change notification settings
Fork1.7k
Star6.7k

Commitf72c9ab

dansiegel

authored

Merge pull request#3013 from PrismLibrary/dev/ds/uno-configure-window

2 parents6bd895d +3d214f4 commitf72c9abCopy full SHA for f72c9ab

File tree

11 files changed

+46

-29

lines changed

Directory.Packages.props
e2e/Uno
- HelloWorld.Mobile
  - HelloWorld.Mobile.csproj
- HelloWorld.Skia.Gtk
  - HelloWorld.Skia.Gtk.csproj
- HelloWorld.Skia.Linux.FrameBuffer
  - HelloWorld.Skia.Linux.FrameBuffer.csproj
- HelloWorld.Skia.WPF
  - HelloWorld.Skia.WPF.csproj
- HelloWorld.Wasm
  - HelloWorld.Wasm.csproj
- HelloWorld.Windows
  - HelloWorld.Windows.csproj
- HelloWorld
  - App.cs
  - HelloWorld.csproj
src
- Maui/Prism.Maui/Navigation
  - PageNavigationService.cs
- Uno/Prism.Uno
  - PrismApplicationBase.cs

11 files changed

+46

-29

lines changed

`‎Directory.Packages.props‎`

Lines changed: 20 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,38 +15,38 @@`
`15`	`15`	`</ItemGroup>`
`16`	`16`	`<!-- Uno-->`
`17`	`17`	`<ItemGroupCondition=" $(IsUnoProject) == 'true'">`
`18`		`- <PackageVersionInclude="Uno.WinUI"Version="5.0.19" />`
`19`		`- <PackageVersionInclude="Uno.WinUI.Skia.Gtk"Version="5.0.19" />`
`20`		`- <PackageVersionInclude="Uno.WinUI.Skia.Linux.FrameBuffer"Version="5.0.19" />`
`21`		`- <PackageVersionInclude="Uno.WinUI.Skia.Wpf"Version="5.0.19" />`
`22`		`- <PackageVersionInclude="Uno.Wasm.Bootstrap"Version="8.0.0" />`
`23`		`- <PackageVersionInclude="Uno.Wasm.Bootstrap.DevServer"Version="8.0.0" />`
`24`		`- <PackageVersionInclude="Uno.WinUI.WebAssembly"Version="5.0.19" />`
`25`		`- <PackageVersionInclude="Uno.WinUI.DevServer"Version="5.0.19" />`
`26`		`- <PackageVersionInclude="Uno.UI.Adapter.Microsoft.Extensions.Logging"Version="5.0.19" />`
	`18`	`+ <PackageVersionInclude="Uno.WinUI"Version="5.0.48" />`
	`19`	`+ <PackageVersionInclude="Uno.WinUI.Skia.Gtk"Version="5.0.48" />`
	`20`	`+ <PackageVersionInclude="Uno.WinUI.Skia.Linux.FrameBuffer"Version="5.0.48" />`
	`21`	`+ <PackageVersionInclude="Uno.WinUI.Skia.Wpf"Version="5.0.48" />`
	`22`	`+ <PackageVersionInclude="Uno.Wasm.Bootstrap"Version="8.0.4" />`
	`23`	`+ <PackageVersionInclude="Uno.Wasm.Bootstrap.DevServer"Version="8.0.4" />`
	`24`	`+ <PackageVersionInclude="Uno.WinUI.WebAssembly"Version="5.0.48" />`
	`25`	`+ <PackageVersionInclude="Uno.WinUI.DevServer"Version="5.0.48" />`
	`26`	`+ <PackageVersionInclude="Uno.UI.Adapter.Microsoft.Extensions.Logging"Version="5.0.48" />`
`27`	`27`	`<PackageVersionInclude="Uno.Core"Version="4.0.1" />`
`28`	`28`	`<PackageVersionInclude="Uno.Core.Extensions.Logging.Singleton"Version="4.0.1" />`
`29`	`29`	`<PackageVersionInclude="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed"Version="2.4.2" />`
`30`	`30`	`<PackageVersionInclude="Microsoft.Xaml.Behaviors.WinUI.Managed"Version="2.0.9" />`
`31`	`31`	`<PackageVersionInclude="Microsoft.WindowsAppSDK"Version="1.2.221109.1"Condition="$(MSBuildProjectName.Contains('Prism'))" />`
`32`		`- <PackageVersionInclude="Microsoft.WindowsAppSDK"Version="1.4.231008000"Condition="!$(MSBuildProjectName.Contains('Prism'))" />`
	`32`	`+ <PackageVersionInclude="Microsoft.WindowsAppSDK"Version="1.4.231115000"Condition="!$(MSBuildProjectName.Contains('Prism'))" />`
`33`	`33`	`<PackageVersionInclude="Microsoft.Windows.SDK.BuildTools"Version="10.0.22621.2428" />`
`34`	`34`	`<PackageVersionInclude="SkiaSharp.Views.Uno.WinUI"Version="2.88.6" />`
`35`	`35`	`<PackageVersionInclude="SkiaSharp.Skottie"Version="2.88.6" />`
`36`		`- <PackageVersionInclude="Uno.Resizetizer"Version="1.2.0" />`
	`36`	`+ <PackageVersionInclude="Uno.Resizetizer"Version="1.2.1" />`
`37`	`37`	`<PackageVersionInclude="Uno.Extensions.Core"Version="3.0.10" />`
`38`	`38`	`<PackageVersionInclude="Uno.Extensions.Logging.OSLog"Version="1.7.0" />`
`39`		`- <PackageVersionInclude="Uno.Extensions.Logging.WinUI"Version="3.0.10" />`
`40`		`- <PackageVersionInclude="Uno.Extensions.Logging.Serilog"Version="3.0.10" />`
	`39`	`+ <PackageVersionInclude="Uno.Extensions.Logging.WinUI"Version="3.0.11" />`
	`40`	`+ <PackageVersionInclude="Uno.Extensions.Logging.Serilog"Version="3.0.11" />`
`41`	`41`	`<PackageVersionInclude="Uno.Extensions.Logging.WebAssembly.Console"Version="1.7.0" />`
`42`		`- <PackageVersionInclude="Uno.Material.WinUI"Version="4.0.4" />`
`43`		`- <PackageVersionInclude="Uno.Toolkit.WinUI.Material"Version="5.0.15" />`
`44`		`- <PackageVersionInclude="Uno.Toolkit.WinUI"Version="5.0.15" />`
`45`		`- <PackageVersionInclude="Uno.Extensions.Hosting.WinUI"Version="3.0.10" />`
`46`		`- <PackageVersionInclude="Microsoft.Extensions.Logging.Console"Version="7.0.0" />`
	`42`	`+ <PackageVersionInclude="Uno.Material.WinUI"Version="4.0.6" />`
	`43`	`+ <PackageVersionInclude="Uno.Toolkit.WinUI.Material"Version="5.0.17" />`
	`44`	`+ <PackageVersionInclude="Uno.Toolkit.WinUI"Version="5.0.17" />`
	`45`	`+ <PackageVersionInclude="Uno.Extensions.Hosting.WinUI"Version="3.0.11" />`
	`46`	`+ <PackageVersionInclude="Microsoft.Extensions.Logging.Console"Version="8.0.0" />`
`47`	`47`	`<PackageVersionInclude="Xamarin.Google.Android.Material"Version="1.10.0.1" />`
`48`	`48`	`<PackageVersionInclude="Uno.UniversalImageLoader"Version="1.9.36" />`
`49`		`- <PackageVersionInclude="Microsoft.Windows.Compatibility"Version="7.0.5" />`
	`49`	`+ <PackageVersionInclude="Microsoft.Windows.Compatibility"Version="8.0.0" />`
`50`	`50`	`</ItemGroup>`
`51`	`51`	`<!-- Tests-->`
`52`	`52`	`<ItemGroup>`
`@@ -77,6 +77,6 @@`
`77`	`77`	`<!-- Global Packages-->`
`78`	`78`	`<PackageVersionInclude="Microsoft.NETFramework.ReferenceAssemblies"Version="1.0.3" />`
`79`	`79`	`<PackageVersionInclude="Nerdbank.GitVersioning"Version="3.6.133" />`
`80`		`- <PackageVersionInclude="Microsoft.SourceLink.GitHub"Version="1.1.1" />`
	`80`	`+ <PackageVersionInclude="Microsoft.SourceLink.GitHub"Version="8.0.0" />`
`81`	`81`	`</ItemGroup>`
`82`	`82`	`</Project>`

`‎e2e/Uno/HelloWorld.Mobile/HelloWorld.Mobile.csproj‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@`
`32`	`32`	`<PackageReferenceInclude="Uno.Extensions.Logging.OSLog" />`
`33`	`33`	`<PackageReferenceInclude="Uno.Extensions.Logging.WinUI" />`
`34`	`34`	`<PackageReferenceInclude="Uno.Extensions.Logging.Serilog" />`
`35`		`- <PackageReferenceInclude="Uno.Extensions.Core" />`
`36`	`35`	`</ItemGroup>`
`37`	`36`	`<Choose>`
`38`	`37`	`<WhenCondition="$(IsAndroid)">`

`‎e2e/Uno/HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`<PackageReferenceInclude="Uno.Extensions.Hosting.WinUI" />`
`21`	`21`	`<PackageReferenceInclude="Uno.Extensions.Logging.WinUI" />`
`22`	`22`	`<PackageReferenceInclude="Uno.Extensions.Logging.Serilog" />`
`23`		`- <PackageReferenceInclude="Uno.Extensions.Core" />`
`24`	`23`	`</ItemGroup>`
`25`	`24`	`<ItemGroup>`
`26`	`25`	`<ProjectReferenceInclude="..\HelloWorld\HelloWorld.csproj" />`

`‎e2e/Uno/HelloWorld.Skia.Linux.FrameBuffer/HelloWorld.Skia.Linux.FrameBuffer.csproj‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`<PackageReferenceInclude="Uno.Extensions.Hosting.WinUI" />`
`21`	`21`	`<PackageReferenceInclude="Uno.Extensions.Logging.WinUI" />`
`22`	`22`	`<PackageReferenceInclude="Uno.Extensions.Logging.Serilog" />`
`23`		`- <PackageReferenceInclude="Uno.Extensions.Core" />`
`24`	`23`	`</ItemGroup>`
`25`	`24`	`<ItemGroup>`
`26`	`25`	`<ProjectReferenceInclude="..\HelloWorld\HelloWorld.csproj" />`

`‎e2e/Uno/HelloWorld.Skia.WPF/HelloWorld.Skia.WPF.csproj‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@`
`29`	`29`	`<PackageReferenceInclude="Uno.Extensions.Hosting.WinUI" />`
`30`	`30`	`<PackageReferenceInclude="Uno.Extensions.Logging.WinUI" />`
`31`	`31`	`<PackageReferenceInclude="Uno.Extensions.Logging.Serilog" />`
`32`		`- <PackageReferenceInclude="Uno.Extensions.Core" />`
`33`	`32`	`</ItemGroup>`
`34`	`33`	`<ItemGroup>`
`35`	`34`	`<ApplicationDefinitionInclude="Wpf\App.xaml"XamlRuntime="Wpf" />`

`‎e2e/Uno/HelloWorld.Wasm/HelloWorld.Wasm.csproj‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@`
`56`	`56`	`<PackageReferenceInclude="Uno.Extensions.Logging.WebAssembly.Console" />`
`57`	`57`	`<PackageReferenceInclude="Uno.Extensions.Logging.WinUI" />`
`58`	`58`	`<PackageReferenceInclude="Uno.Extensions.Logging.Serilog" />`
`59`		`- <PackageReferenceInclude="Uno.Extensions.Core" />`
`60`	`59`	`</ItemGroup>`
`61`	`60`	`<ItemGroup>`
`62`	`61`	`<ProjectReferenceInclude="..\HelloWorld\HelloWorld.csproj" />`

`‎e2e/Uno/HelloWorld.Windows/HelloWorld.Windows.csproj‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@`
`35`	`35`	`<PackageReferenceInclude="Uno.Extensions.Hosting.WinUI" />`
`36`	`36`	`<PackageReferenceInclude="Uno.Extensions.Logging.WinUI" />`
`37`	`37`	`<PackageReferenceInclude="Uno.Extensions.Logging.Serilog" />`
`38`		`- <PackageReferenceInclude="Uno.Extensions.Core" />`
`39`	`38`	`</ItemGroup>`
`40`	`39`
`41`	`40`	`<ItemGroup>`

`‎e2e/Uno/HelloWorld/App.cs‎`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`usingHelloWorld.Views;`
`2`	`2`	`usingModuleA;`
	`3`	`+usingUno.UI;`
`3`	`4`
`4`	`5`	`namespaceHelloWorld;`
`5`	`6`
`@@ -35,6 +36,13 @@ protected override void ConfigureHost(IHostBuilder builder)`
`35`	`36`	`});`
`36`	`37`	`}`
`37`	`38`
	`39`	`+protectedoverridevoidConfigureWindow(Windowwindow)`
	`40`	`+{`
	`41`	`+#ifDEBUG`
	`42`	`+window.EnableHotReload();`
	`43`	`+#endif`
	`44`	`+}`
	`45`	`+`
`38`	`46`	`protectedoverridevoidRegisterTypes(IContainerRegistrycontainerRegistry)`
`39`	`47`	`{`
`40`	`48`	`// Register types with the container or for Navigation`

`‎e2e/Uno/HelloWorld/HelloWorld.csproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@`
`11`	`11`	`<ItemGroup>`
`12`	`12`	`<PackageReferenceInclude="Uno.WinUI" />`
`13`	`13`	`<PackageReferenceInclude="Uno.Resizetizer" />`
`14`		`- <PackageReferenceInclude="Uno.Extensions.Core" />`
`15`	`14`	`<PackageReferenceInclude="Uno.Extensions.Logging.WinUI" />`
`16`	`15`	`<PackageReferenceInclude="Uno.Extensions.Logging.Serilog" />`
`17`	`16`	`<PackageReferenceInclude="Uno.Material.WinUI" />`
`18`	`17`	`<PackageReferenceInclude="Uno.Toolkit.WinUI.Material" />`
`19`	`18`	`<PackageReferenceInclude="Uno.Toolkit.WinUI" />`
`20`	`19`	`<PackageReferenceInclude="Uno.Extensions.Hosting.WinUI" />`
`21`	`20`	`<PackageReferenceInclude="Microsoft.Extensions.Logging.Console" />`
	`21`	`+ <PackageReferenceInclude="Uno.WinUI.DevServer"Condition=" $(Configuration) == 'Debug'" />`
`22`	`22`	`</ItemGroup>`
`23`	`23`
`24`	`24`	`<Choose>`

`‎src/Maui/Prism.Maui/Navigation/PageNavigationService.cs‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ protected virtual async Task ProcessNavigation(Page currentPage, Queue<string> s`
`345`	`345`
`346`	`346`	`animated=parameters.ContainsKey(KnownNavigationParameters.Animated)?`
`347`	`347`	`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;`
`349`	`349`
`350`	`350`	`if(nextSegment==RemovePageSegment)`
`351`	`351`	`{`
`@@ -837,7 +837,7 @@ async Task ConfigureTabbedPage(TabbedPage tabbedPage, string segment, INavigatio`
`837`	`837`	`{`
`838`	`838`	`vartabSegment=tabSegments[i];`
`839`	`839`	`varchild=CreatePageFromSegment(tabSegment);`
`840`		`-varchildParameters=UriParsingHelper.GetSegmentParameters(tabSegment,parameters);`
	`840`	`+varchildParameters=UriParsingHelper.GetSegmentParameters(tabSegment,parameters);`
`841`	`841`	`if(i==0&&childisNavigationPagenavPage)`
`842`	`842`	`{`
`843`	`843`	`navigationPage=navPage;`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp