Skip to content

Commit 8998d87

Browse files
committed
Prism.Avalonia removed unsupported XamlModuleCatalog from project
1 parent 4a4e3a4 commit 8998d87

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Prism.Avalonia helps you more easily design and build rich, flexible, and easy t
2828
<Compile Include="..\..\Wpf\Prism.Wpf\Navigation\Regions\**\*.cs" LinkBase="Navigation\Regions" />
2929

3030
<Compile Remove="..\..\Wpf\Prism.Wpf\Interactivity\InvokeCommandAction.cs" />
31+
<Compile Remove="..\..\Wpf\Prism.Wpf\Modularity\XamlModuleCatalog.cs" />
3132
<Compile Remove="..\..\Wpf\Prism.Wpf\Navigation\Regions\ItemMetadata.cs" />
3233
<Compile Remove="..\..\Wpf\Prism.Wpf\Navigation\Regions\Behaviors\BindRegionContextToDependencyObjectBehavior.cs" />
3334
<Compile Remove="..\..\Wpf\Prism.Wpf\Navigation\Regions\Behaviors\SelectorItemsSourceSyncBehavior.cs" />

src/Wpf/Prism.Wpf/Modularity/XamlModuleCatalog.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
#if !AVALONIA
21
using System.IO;
32
using System.Windows.Markup;
4-
//// using Avalonia.Markup.Xaml;
53

64
namespace Prism.Modularity
75
{
@@ -95,11 +93,7 @@ private static ModuleCatalog CreateFromXaml(Stream xamlStream)
9593
throw new ArgumentNullException(nameof(xamlStream));
9694
}
9795

98-
#if !AVALONIA
9996
return XamlReader.Load(xamlStream) as ModuleCatalog;
100-
#else
101-
return AvaloniaRuntimeXamlLoader.Load(xamlStream, null) as ModuleCatalog;
102-
#endif
10397
}
10498

10599
/// <summary>
@@ -119,6 +113,4 @@ private static ModuleCatalog CreateFromXaml(Uri builderResourceUri)
119113
return null;
120114
}
121115
}
122-
}
123-
#endif
124-
116+
}

0 commit comments

Comments
 (0)