Merge pull request #3205 from PrismLibrary/dev/ds/migrate-mobile-modules

Use Maui version for Modules

Author: dansiegel

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 UNO_WINUI
+[Microsoft.UI.Xaml.Markup.ContentProperty(Name = nameof(Items))]
+#else
 [ContentProperty(nameof(Items))]
+#endif
 public class ModuleCatalog : ModuleCatalogBase
 {
 

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>

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\**" />