Skip to content

Commit

Permalink
chore: begin removing duplicate code
Browse files Browse the repository at this point in the history
  • Loading branch information
dansiegel committed Aug 28, 2024
1 parent 46f7cca commit 06f68ca
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 399 deletions.
3 changes: 3 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@
<Using Include="Avalonia.Styling" />
<Using Include="Avalonia.VisualTree" />
-->
<Using Include="Avalonia.Controls.Control" Alias="FrameworkElement" />
<Using Include="Avalonia.AvaloniaObject" Alias="DependencyObject" />
<Using Include="Avalonia.AvaloniaPropertyChangedEventArgs" Alias="DependencyPropertyChangedEventArgs" />
</ItemGroup>
</When>
</Choose>
Expand Down
80 changes: 0 additions & 80 deletions src/Avalonia/Prism.Avalonia/Common/MvvmHelpers.cs

This file was deleted.

70 changes: 0 additions & 70 deletions src/Avalonia/Prism.Avalonia/Ioc/ContainerProviderExtension.cs

This file was deleted.

101 changes: 0 additions & 101 deletions src/Avalonia/Prism.Avalonia/Ioc/IContainerRegistryExtensions.cs

This file was deleted.

67 changes: 0 additions & 67 deletions src/Avalonia/Prism.Avalonia/Mvvm/ViewModelLocator.cs

This file was deleted.

19 changes: 12 additions & 7 deletions src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
<Description>Prism.Avalonia is a fully open source version of the Prism guidance originally produced by Microsoft Patterns &amp; Practices. Prism.Avalonia 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 Standard. Features that need to be platform specific are implemented in the respective libraries for the target platform (Avalonia, WPF, Uno Platform, and Xamarin Forms).

Prism.Avalonia helps you more easily design and build rich, flexible, and easy to maintain cross-platform Avalonia desktop applications. This library provides user interface composition as well as modularity support.</Description>
<Copyright>Copyright (c) 2024 Xeno Innovations, Inc.</Copyright>
<Authors>Damian Suess, Suess Labs, various contributors</Authors>

<Title>Prism.Avalonia</Title>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
Expand All @@ -24,12 +22,19 @@ Prism.Avalonia helps you more easily design and build rich, flexible, and easy t
<Compile Remove="**\*.net45.cs" />
<None Include="**\*.net45.cs" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Wpf\Prism.Wpf\Common\MvvmHelpers.cs" LinkBase="Common" />
<Compile Include="..\..\Wpf\Prism.Wpf\PrismInitializationExtensions.cs" Link="PrismInitializationExtensions.cs" />
<Compile Include="..\..\Wpf\Prism.Wpf\Ioc\*.cs" LinkBase="Ioc" />
<Compile Include="..\..\Wpf\Prism.Wpf\Mvvm\*.cs" LinkBase="Mvvm" />

<Using Include="Prism.Extensions" />
</ItemGroup>

<ItemGroup>
<None Include="..\..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<!-- We probably don't want to support this in Avalonia projects keeping for now -->
<Compile Remove="PrismBootstrapperBase.cs" />
<None Include="PrismBootstrapperBase.cs" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 0 additions & 5 deletions src/Avalonia/Prism.Avalonia/PrismApplicationBase.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
using System;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Prism.Common;
using Prism.Ioc;
using Prism.Modularity;
using Prism.Navigation.Regions;

Expand Down
2 changes: 1 addition & 1 deletion src/Avalonia/Prism.Avalonia/PrismBootstrapperBase.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using Avalonia;
using Avalonia.Controls;
using Prism.Common;
Expand Down
Loading

0 comments on commit 06f68ca

Please sign in to comment.