From 400d2f5304a412db4edc02e27eb282a3fb8d5359 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Mon, 22 Jul 2024 08:27:44 -0600
Subject: [PATCH 1/4] chore: use Maui version for Modules

---
 src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj b/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
index 497f5f6042..b8b05f717f 100644
--- a/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
+++ b/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
@@ -29,7 +29,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\Wpf\Prism.Wpf\**\*.cs" Exclude="..\..\Wpf\Prism.Wpf\bin\**\*.cs;..\..\Wpf\Prism.Wpf\obj\**\*.cs" />
-    <Compile Include="..\..\Forms\Prism.Forms\Modularity\*.cs" LinkBase="Modularity" />
+    <Compile Include="..\..\Maui\Prism.Maui\Modularity\*.cs" LinkBase="Modularity" />
     <Compile Remove="**\*.net45.cs" />
     <Compile Remove="**\*.netcore.cs" />
     <Compile Remove="..\..\Wpf\Prism.Wpf\Modularity\**" />

From 1efdbe3aef6cf3d3fd1d372c7c11c0a2acfe2ead Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Mon, 22 Jul 2024 10:03:42 -0600
Subject: [PATCH 2/4] chore: use explicit ContentProperty

---
 src/Maui/Prism.Maui/Modularity/ModuleCatalog.cs | 11 ++++++++++-
 src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj        |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Maui/Prism.Maui/Modularity/ModuleCatalog.cs b/src/Maui/Prism.Maui/Modularity/ModuleCatalog.cs
index 1994e451f8..36d0eae9c5 100644
--- a/src/Maui/Prism.Maui/Modularity/ModuleCatalog.cs
+++ b/src/Maui/Prism.Maui/Modularity/ModuleCatalog.cs
@@ -1,6 +1,15 @@
-namespace Prism.Modularity;
+namespace Prism.Modularity;
 
+/// <summary>
+/// The <see cref="ModuleCatalog"/> holds information about the modules that can be used by the
+/// application. Each module is described in a <see cref="ModuleInfo"/> class, that records the
+/// name and type of the module.
+/// </summary>
+#if PRISMUNO
+[Microsoft.UI.Xaml.Markup.ContentProperty(Name = nameof(Items))]
+#else
 [ContentProperty(nameof(Items))]
+#endif
 public class ModuleCatalog : ModuleCatalogBase
 {
 
diff --git a/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj b/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
index b8b05f717f..578be83fed 100644
--- a/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
+++ b/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
@@ -8,6 +8,7 @@
     <NoWarn>$(NoWarn);1591</NoWarn>
     <PackageId>Prism.Uno.WinUI</PackageId>
     <ImplicitUsings>true</ImplicitUsings>
+    <DefineConstants>$(DefineConstants);PRISMUNO</DefineConstants>
     <Description>
       Prism provides an implementation of a collection of design patterns that are helpful in writing well structured, maintainable, and testable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared library targeting the .NET Framework and .NET. Features that need to be platform specific are implemented in the respective libraries for the target platform (WPF, Uno Platform, .NET MAUI and Xamarin Forms).
 

From 714f4b67e69fb93782d5b489933bad0d105bdadc Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Mon, 22 Jul 2024 17:48:05 -0600
Subject: [PATCH 3/4] chore: revert to using UNO_WINUI constant

---
 src/Maui/Prism.Maui/Modularity/ModuleCatalog.cs | 2 +-
 src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Maui/Prism.Maui/Modularity/ModuleCatalog.cs b/src/Maui/Prism.Maui/Modularity/ModuleCatalog.cs
index 36d0eae9c5..943acea55c 100644
--- a/src/Maui/Prism.Maui/Modularity/ModuleCatalog.cs
+++ b/src/Maui/Prism.Maui/Modularity/ModuleCatalog.cs
@@ -5,7 +5,7 @@ namespace Prism.Modularity;
 /// application. Each module is described in a <see cref="ModuleInfo"/> class, that records the
 /// name and type of the module.
 /// </summary>
-#if PRISMUNO
+#if UNO_WINUI
 [Microsoft.UI.Xaml.Markup.ContentProperty(Name = nameof(Items))]
 #else
 [ContentProperty(nameof(Items))]
diff --git a/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj b/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
index 578be83fed..b8b05f717f 100644
--- a/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
+++ b/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
@@ -8,7 +8,6 @@
     <NoWarn>$(NoWarn);1591</NoWarn>
     <PackageId>Prism.Uno.WinUI</PackageId>
     <ImplicitUsings>true</ImplicitUsings>
-    <DefineConstants>$(DefineConstants);PRISMUNO</DefineConstants>
     <Description>
       Prism provides an implementation of a collection of design patterns that are helpful in writing well structured, maintainable, and testable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared library targeting the .NET Framework and .NET. Features that need to be platform specific are implemented in the respective libraries for the target platform (WPF, Uno Platform, .NET MAUI and Xamarin Forms).
 

From 4ef20a5bf7ba6690319f5213d6bd7fc6930259fb Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Mon, 22 Jul 2024 20:14:37 -0600
Subject: [PATCH 4/4] chore: fix content property

---
 src/Maui/Prism.Maui/Modularity/ModuleInfo.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Maui/Prism.Maui/Modularity/ModuleInfo.cs b/src/Maui/Prism.Maui/Modularity/ModuleInfo.cs
index f91fdc693b..d11bb09cad 100644
--- a/src/Maui/Prism.Maui/Modularity/ModuleInfo.cs
+++ b/src/Maui/Prism.Maui/Modularity/ModuleInfo.cs
@@ -4,7 +4,14 @@
 
 namespace Prism.Modularity;
 
+/// <summary>
+/// Defines the metadata that describes a module.
+/// </summary>
+#if UNO_WINUI
+[Microsoft.UI.Xaml.Markup.ContentProperty(Name = nameof(DependsOn))]
+#else
 [ContentProperty(nameof(DependsOn))]
+#endif
 public partial class ModuleInfo : IModuleInfo
 {
     /// <summary>