Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Maui version for Modules #3205

Merged
merged 4 commits into from
Jul 23, 2024
Merged

Use Maui version for Modules #3205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
400d2f5
chore: use Maui version for Modules
dansiegel Jul 22, 2024
1efdbe3
chore: use explicit ContentProperty
dansiegel Jul 22, 2024
714f4b6
chore: revert to using UNO_WINUI constant
dansiegel Jul 22, 2024
4ef20a5
chore: fix content property
dansiegel Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/Maui/Prism.Maui/Modularity/ModuleCatalog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{

Expand Down
7 changes: 7 additions & 0 deletions src/Maui/Prism.Maui/Modularity/ModuleInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\**" />
Expand Down
Loading