From c1dbdb370039880d0f787b9a95fe089eccc5bcc7 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Fri, 9 Jun 2023 17:47:23 -0600
Subject: [PATCH 1/2] chore: update dependencies

---
 Directory.Packages.props                 | 46 ++++++++++++------------
 src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj |  7 ++--
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9aa7191eaa..a972e62fab 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,23 +1,23 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="DryIoc.dll" Version="5.3.3" />
+    <PackageVersion Include="DryIoc.dll" Version="5.4.0" />
     <PackageVersion Include="Unity.Container" Version="5.11.11" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
-    <PackageVersion Include="System.Reactive" Version="5.0.0" />
+    <PackageVersion Include="System.Reactive" Version="6.0.0" />
     <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2401" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
   </ItemGroup>
   <!-- Uno -->
   <ItemGroup Condition=" $(IsUnoProject) == 'true' ">
-    <PackageVersion Include="Uno.WinUI" Version="4.7.37" />
-    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.7.37" />
-    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.7.37" />
-    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="4.7.37" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.17" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.17" />
-    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.7.37" />
-    <PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.7.37" />
-    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.37" />
+    <PackageVersion Include="Uno.WinUI" Version="4.9.20" />
+    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.9.20" />
+    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.9.20" />
+    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="4.9.20" />
+    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.24" />
+    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.24" />
+    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.9.20" />
+    <PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.9.20" />
+    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.20" />
     <PackageVersion Include="Uno.Core" Version="4.0.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
     <PackageVersion Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.3.0" />
@@ -29,16 +29,16 @@
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
     <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
     <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.3" />
-    <PackageVersion Include="Uno.Resizetizer" Version="0.36.0-dev.129" />
-    <PackageVersion Include="Uno.Extensions.Core" Version="2.3.0-dev.690" />
+    <PackageVersion Include="Uno.Resizetizer" Version="1.1.0" />
+    <PackageVersion Include="Uno.Extensions.Core" Version="2.4.2" />
     <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
-    <PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="2.3.0-dev.690" />
-    <PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="2.3.0-dev.690" />
+    <PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="2.4.2" />
+    <PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="2.4.2" />
     <PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.3.0" />
-    <PackageVersion Include="Uno.Material.WinUI" Version="2.5.0-dev.31" />
-    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="2.5.0-dev.23" />
-    <PackageVersion Include="Uno.Toolkit.WinUI" Version="2.5.0-dev.23" />
-    <PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="2.3.0-dev.690" />
+    <PackageVersion Include="Uno.Material.WinUI" Version="2.6.1" />
+    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="3.0.4" />
+    <PackageVersion Include="Uno.Toolkit.WinUI" Version="3.0.4" />
+    <PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="2.4.2" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.7.0.2" />
     <PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
@@ -46,12 +46,12 @@
   </ItemGroup>
   <!-- Tests -->
   <ItemGroup>
-    <PackageVersion Include="coverlet.collector" Version="3.2.0" />
-    <PackageVersion Include="GitHubActionsTestLogger" Version="2.0.1" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+    <PackageVersion Include="GitHubActionsTestLogger" Version="2.3.2" />
     <PackageVersion Include="Xamarin.Forms.Mocks" Version="4.7.0.1" />
     <PackageVersion Include="Humanizer.Core" Version="2.14.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="xunit" Version="2.4.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
@@ -72,7 +72,7 @@
   <ItemGroup>
     <!-- Global Packages -->
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
-    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.5.119" />
+    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
   </ItemGroup>
 </Project>
diff --git a/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj b/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
index e550eccc71..db1af7d5b3 100644
--- a/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
+++ b/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
@@ -24,6 +24,10 @@
     <None Include="build\*.targets" Pack="true" PackagePath="buildTransitive" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Uno.Extensions.Hosting.WinUI" />
+  </ItemGroup>
+
   <ItemGroup Condition="!$(TargetFramework.Contains('windows10'))">
     <PackageReference Include="Uno.WinUI" />
     <PackageReference Include="Uno.Core" />
@@ -67,9 +71,6 @@
     <Compile Include="..\..\Maui\Prism.Maui\Ioc\IServiceCollectionAware.cs" LinkBase="Ioc" />
     <Compile Include="..\..\Maui\Prism.Maui\Ioc\MicrosoftDependencyInjectionExtensions.cs" LinkBase="Ioc" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Uno.Extensions.Hosting.WinUI" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Prism.Core\Prism.Core.csproj" />
   </ItemGroup>

From dec34c76660e570cd00c0c2242a82968ddd25c31 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Fri, 9 Jun 2023 18:49:18 -0600
Subject: [PATCH 2/2] chore: alias ExceptionExtensions

---
 src/Containers/Prism.DryIoc.Shared/DryIocContainerExtension.cs | 1 +
 src/Uno/Prism.Uno/PrismApplicationBase.cs                      | 2 +-
 src/Wpf/Prism.DryIoc.Wpf/PrismApplication.cs                   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Containers/Prism.DryIoc.Shared/DryIocContainerExtension.cs b/src/Containers/Prism.DryIoc.Shared/DryIocContainerExtension.cs
index b0522c796c..666f2539d9 100644
--- a/src/Containers/Prism.DryIoc.Shared/DryIocContainerExtension.cs
+++ b/src/Containers/Prism.DryIoc.Shared/DryIocContainerExtension.cs
@@ -3,6 +3,7 @@
 using DryIoc;
 using Prism.Ioc;
 using Prism.Ioc.Internals;
+using ExceptionExtensions = System.ExceptionExtensions;
 using IContainer = DryIoc.IContainer;
 
 namespace Prism.DryIoc
diff --git a/src/Uno/Prism.Uno/PrismApplicationBase.cs b/src/Uno/Prism.Uno/PrismApplicationBase.cs
index 0168aaa44a..7fe5cbac06 100644
--- a/src/Uno/Prism.Uno/PrismApplicationBase.cs
+++ b/src/Uno/Prism.Uno/PrismApplicationBase.cs
@@ -219,7 +219,7 @@ protected virtual void ConfigureRegionAdapterMappings(RegionAdapterMappings regi
 
         /// <summary>
         /// Registers the <see cref="Type"/>s of the Exceptions that are not considered
-        /// root exceptions by the <see cref="ExceptionExtensions"/>.
+        /// root exceptions by the <see cref="System.ExceptionExtensions"/>.
         /// </summary>
         protected virtual void RegisterFrameworkExceptionTypes()
         {
diff --git a/src/Wpf/Prism.DryIoc.Wpf/PrismApplication.cs b/src/Wpf/Prism.DryIoc.Wpf/PrismApplication.cs
index c921594993..56c41fe3f6 100644
--- a/src/Wpf/Prism.DryIoc.Wpf/PrismApplication.cs
+++ b/src/Wpf/Prism.DryIoc.Wpf/PrismApplication.cs
@@ -2,6 +2,7 @@
 using DryIoc;
 using Prism.Ioc;
 using Prism.Regions;
+using ExceptionExtensions = System.ExceptionExtensions;
 
 namespace Prism.DryIoc
 {