[Core] WDE.Common and WDE.Module no longer have WPF dependencies

billy1arm · Feb 14, 2021 · b519915 · b519915
1 parent 9fc3245
commit b519915
Show file tree

Hide file tree

Showing 76 changed files with 336 additions and 444 deletions.
diff --git a/GeminiGraphEditor/GeminiGraphEditor.csproj b/GeminiGraphEditor/GeminiGraphEditor.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net5.0-windows7.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>

diff --git a/QuestChainTest/QuestChainTest.csproj b/QuestChainTest/QuestChainTest.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net5.0-windows7.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>

diff --git a/WDE.AzerothCore/WDE.AzerothCore.csproj b/WDE.AzerothCore/WDE.AzerothCore.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0-windows</TargetFramework>
+        <TargetFrameworks>net5.0;net5.0-windows7.0</TargetFrameworks>
         <OutputType>Library</OutputType>
-        <UseWPF>true</UseWPF>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>nullable</WarningsAsErrors>
     </PropertyGroup>

diff --git a/WDE.Blueprints/Providers/BlueprintItemProvider.cs b/WDE.Blueprints/Providers/BlueprintItemProvider.cs
@@ -3,6 +3,7 @@
 using System.Windows.Media.Imaging;
 using WDE.Common;
 using WDE.Common.CoreVersion;
+using WDE.Common.Types;
 using WDE.Module.Attributes;
 
 namespace WDE.Blueprints.Providers
@@ -22,10 +23,7 @@ public string GetDescription()
             return "Script in new Blueprints system";
         }
 
-        public ImageSource GetImage()
-        {
-            return new BitmapImage(new Uri("/WDE.Blueprints;component/Resources/icon.png", UriKind.Relative));
-        }
+        public ImageUri GetImage() => new("Resources/blueprint_icon.png");
 
         public string GetName()
         {

diff --git a/WDE.Blueprints/Resources/icon.png → WDE.Blueprints/Resources/blueprint_icon.png b/WDE.Blueprints/Resources/icon.png → WDE.Blueprints/Resources/blueprint_icon.png
diff --git a/WDE.Blueprints/WDE.Blueprints.csproj b/WDE.Blueprints/WDE.Blueprints.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net5.0-windows7.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>
@@ -22,7 +22,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\icon.png" />
+    <None Include="Resources\blueprint_icon.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommonServiceLocator">

diff --git a/WDE.Common.WPF/Components/WdeImage.cs b/WDE.Common.WPF/Components/WdeImage.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media.Imaging;
+using WDE.Common.Types;
+
+namespace WDE.Common.WPF.Components
+{
+    public class WdeImage : Image
+    {
+        // we are never releasing those intentionally
+        private static Dictionary<ImageUri, BitmapImage> cache = new();
+
+        public ImageUri Image
+        {
+            get => (ImageUri) GetValue(ImageProperty);
+            set => SetValue(ImageProperty, value);
+        }
+
+        public static readonly DependencyProperty ImageProperty =
+            DependencyProperty.Register(
+                nameof(Image),
+                typeof(ImageUri),
+                typeof(WdeImage),
+                new FrameworkPropertyMetadata(
+                    default(ImageUri),
+                    FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender,
+                    new PropertyChangedCallback(OnSourceChanged),
+                    null),
+                null);
+
+        private static void OnSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var img = (ImageUri)d.GetValue(ImageProperty);
+            if (!cache.TryGetValue(img, out var bitmap))
+            {
+                bitmap = cache[img] =
+                    new BitmapImage(new Uri(System.IO.Path.Combine(Environment.CurrentDirectory, img.Uri), UriKind.Absolute));
+            }
+            d.SetValue(SourceProperty, bitmap);
+        }
+    }
+}
diff --git a/...itor.Common/WDE.Common/Utils/GridUtils.cs → WDE.Common.WPF/Utils/GridUtils.cs b/...itor.Common/WDE.Common/Utils/GridUtils.cs → WDE.Common.WPF/Utils/GridUtils.cs
@@ -3,7 +3,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace WDE.Common.Utils
+namespace WDE.Common.WPF.Utils
 {
     public static class GridUtils
     {

diff --git a/...mmon/WDE.Common/Utils/LoadingSpinner.xaml → WDE.Common.WPF/Utils/LoadingSpinner.xaml b/...mmon/WDE.Common/Utils/LoadingSpinner.xaml → WDE.Common.WPF/Utils/LoadingSpinner.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="WDE.Common.Utils.LoadingSpinner"
+<UserControl x:Class="WDE.Common.WPF.Utils.LoadingSpinner"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

diff --git a/...n/WDE.Common/Utils/LoadingSpinner.xaml.cs → WDE.Common.WPF/Utils/LoadingSpinner.xaml.cs b/...n/WDE.Common/Utils/LoadingSpinner.xaml.cs → WDE.Common.WPF/Utils/LoadingSpinner.xaml.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace WDE.Common.Utils
+namespace WDE.Common.WPF.Utils
 {
     public partial class LoadingSpinner : UserControl
     {

diff --git a/...ditor.Common/WDE.Common/Utils/ViewBind.cs → WDE.Common.WPF/Utils/ViewBind.cs b/...ditor.Common/WDE.Common/Utils/ViewBind.cs → WDE.Common.WPF/Utils/ViewBind.cs
@@ -2,10 +2,9 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Markup;
-using Prism.Ioc;
 using WDE.Common.Windows;
 
-namespace WDE.Common.Utils
+namespace WDE.Common.WPF.Utils
 {
     public class ViewBind
     {

diff --git a/.../ViewHelpers/BoolToVisibilityConverter.cs → .../ViewHelpers/BoolToVisibilityConverter.cs b/.../ViewHelpers/BoolToVisibilityConverter.cs → .../ViewHelpers/BoolToVisibilityConverter.cs
@@ -3,7 +3,7 @@
 using System.Windows;
 using System.Windows.Data;
 
-namespace WDE.SmartScriptEditor.Editor.Helpers
+namespace WDE.Common.WPF.ViewHelpers
 {
     public class BooleanToVisibilityConverter : IValueConverter
     {

diff --git a/...mon/ViewHelpers/IntInputValidationRule.cs → ...WPF/ViewHelpers/IntInputValidationRule.cs b/...mon/ViewHelpers/IntInputValidationRule.cs → ...WPF/ViewHelpers/IntInputValidationRule.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Windows.Controls;
 
-namespace WDE.Common.ViewHelpers
+namespace WDE.Common.WPF.ViewHelpers
 {
     public class IntInputValidationRule: ValidationRule
     {

diff --git a/.../ViewHelpers/NullToVisibilityConverter.cs → .../ViewHelpers/NullToVisibilityConverter.cs b/.../ViewHelpers/NullToVisibilityConverter.cs → .../ViewHelpers/NullToVisibilityConverter.cs
@@ -3,7 +3,7 @@
 using System.Windows;
 using System.Windows.Data;
 
-namespace WDE.Common.ViewHelpers
+namespace WDE.Common.WPF.ViewHelpers
 {
     public class NullToVisibilityConverter : IValueConverter
     {

diff --git a/...E.Common/ViewHelpers/StretchedTreeView.cs → ...mmon.WPF/ViewHelpers/StretchedTreeView.cs b/...E.Common/ViewHelpers/StretchedTreeView.cs → ...mmon.WPF/ViewHelpers/StretchedTreeView.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
 
-namespace WDE.Common.ViewHelpers
+namespace WDE.Common.WPF.ViewHelpers
 {
     // https://stackoverflow.com/a/35557401
     public class StretchedTreeView: TreeView
@@ -34,7 +29,7 @@ private void StretchingTreeViewItem_Loaded(object sender, RoutedEventArgs e)
             // The purpose of this code is to stretch the Header Content all the way accross the TreeView. 
             if (this.VisualChildrenCount > 0)
             {
-                Grid grid = this.GetVisualChild(0) as Grid;
+                Grid? grid = this.GetVisualChild(0) as Grid;
                 if (grid != null && grid.ColumnDefinitions.Count == 3)
                 {
                     // Remove the middle column which is set to Auto and let it get replaced with the 

diff --git a/...ViewHelpers/ViewItemDoubleClickCommand.cs → ...ViewHelpers/ViewItemDoubleClickCommand.cs b/...ViewHelpers/ViewItemDoubleClickCommand.cs → ...ViewHelpers/ViewItemDoubleClickCommand.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Windows;
-using System.Windows.Input;
 using System.Windows.Controls;
+using System.Windows.Input;
 
-namespace WDE.Common.ViewHelpers
+namespace WDE.Common.WPF.ViewHelpers
 {
     public sealed class ViewItemDoubleClickCommand
     {

diff --git a/WDE.Common.WPF/WDE.Common.WPF.csproj b/WDE.Common.WPF/WDE.Common.WPF.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net5.0-windows7.0</TargetFramework>
+        <OutputType>Library</OutputType>
+        <UseWPF>true</UseWPF>
+        <Nullable>enable</Nullable>
+        <WarningsAsErrors>nullable</WarningsAsErrors>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\WoWDatabaseEditor.Common\WDE.Common\WDE.Common.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/WDE.Conditions/WDE.Conditions.csproj b/WDE.Conditions/WDE.Conditions.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net5.0-windows</TargetFramework>
+        <TargetFrameworks>net5.0;net5.0-windows7.0</TargetFrameworks>
         <OutputType>Library</OutputType>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-        <UseWPF>true</UseWPF>
         <Nullable>enable</Nullable>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,28 +36,8 @@
         </None>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="AsyncAwaitBestPractices.MVVM">
-            <Version>5.0.2</Version>
-        </PackageReference>
-        <PackageReference Include="CommonServiceLocator">
-            <Version>2.0.5</Version>
-        </PackageReference>
-        <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-        <PackageReference Include="Prism.Wpf">
-            <Version>8.0.0.1909</Version>
-        </PackageReference>
         <PackageReference Include="SmartFormat.NET">
             <Version>2.5.3</Version>
         </PackageReference>
-        <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-        <PackageReference Include="Unity.Abstractions">
-            <Version>5.11.6</Version>
-        </PackageReference>
-        <PackageReference Include="Unity.Container">
-            <Version>5.11.10</Version>
-        </PackageReference>
-        <PackageReference Include="Unity.RegistrationByConvention">
-            <Version>5.11.1</Version>
-        </PackageReference>
     </ItemGroup>
-</Project>
+</Project>
diff --git a/WDE.HistoryWindow/ViewModels/HistoryViewModel.cs b/WDE.HistoryWindow/ViewModels/HistoryViewModel.cs
@@ -21,7 +21,7 @@ internal class HistoryEvent
     [SingleInstance]
     internal class HistoryViewModel : BindableBase, ITool
     {
-        private Visibility visibility;
+        private bool visibility;
 
         private IDocument previousDocument;
 
@@ -66,7 +66,7 @@ public bool IsSelected
             set => SetProperty(ref isSelected, value);
         }
 
-        public Visibility Visibility
+        public bool Visibility
         {
             get => visibility;
             set => SetProperty(ref visibility, value);

diff --git a/WDE.HistoryWindow/WDE.HistoryWindow.csproj b/WDE.HistoryWindow/WDE.HistoryWindow.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net5.0-windows7.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>

diff --git a/WDE.MVVM.Test/WDE.MVVM.Test.csproj b/WDE.MVVM.Test/WDE.MVVM.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0-windows</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 

diff --git a/WDE.MVVM/WDE.MVVM.csproj b/WDE.MVVM/WDE.MVVM.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0-windows</TargetFramework>
+        <TargetFrameworks>net5.0;net5.0-windows7.0</TargetFrameworks>
         <OutputType>Library</OutputType>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>nullable</WarningsAsErrors>

diff --git a/WDE.Parameters/WDE.Parameters.csproj b/WDE.Parameters/WDE.Parameters.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net5.0-windows7.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>

diff --git a/WDE.QuestChainEditor/WDE.QuestChainEditor.csproj b/WDE.QuestChainEditor/WDE.QuestChainEditor.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net5.0-windows7.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>

diff --git a/WDE.SQLEditor/WDE.SQLEditor.csproj b/WDE.SQLEditor/WDE.SQLEditor.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net5.0-windows7.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>

diff --git a/WDE.SmartScriptEditor/Editor/ViewModels/ToolSmartEditorViewModel.cs b/WDE.SmartScriptEditor/Editor/ViewModels/ToolSmartEditorViewModel.cs
@@ -17,21 +17,21 @@ public interface IToolSmartEditorViewModel
 
     public class ToolSmartEditorViewModel : ObservableBase, ITool, IToolSmartEditorViewModel
     {
-        public bool IsOpened => Visibility == Visibility.Visible;
+        public bool IsOpened => Visibility;
         public string Title => "Smart edit";
         public string UniqueId => "tc_smart_script_edit";
         public ToolPreferedPosition PreferedPosition => ToolPreferedPosition.Left;
         public bool OpenOnStart => false;
         private bool isSelected;
-        private Visibility visibility;
+        private bool visibility;
 
         public bool IsSelected
         {
             get => isSelected;
             set => SetProperty(ref isSelected, value);
         }
 
-        public Visibility Visibility
+        public bool Visibility
         {
             get => visibility;
             set => SetProperty(ref visibility, value);

diff --git a/WDE.SmartScriptEditor/Editor/Views/SmartDataEditors/SmartDataActionsEditorView.xaml b/WDE.SmartScriptEditor/Editor/Views/SmartDataEditors/SmartDataActionsEditorView.xaml
@@ -6,6 +6,7 @@
         xmlns:local="clr-namespace:WDE.SmartScriptEditor.Editor.Views"
         xmlns:helpers="clr-namespace:WDE.Common.ViewHelpers;assembly=WDE.Common"
         xmlns:mvvm="http://prismlibrary.com/"
+        xmlns:viewHelpers="clr-namespace:WDE.Common.WPF.ViewHelpers;assembly=WDE.Common.WPF"
         mvvm:ViewModelLocator.AutoWireViewModel="False"
         mc:Ignorable="d"
         Height="666" Width="473"
@@ -42,7 +43,7 @@
                 <TextBox.Text>
                     <Binding Path="Source.Id" Mode="TwoWay" NotifyOnValidationError="True">
                         <Binding.ValidationRules>
-                            <helpers:IntInputValidationRule />
+                            <viewHelpers:IntInputValidationRule />
                         </Binding.ValidationRules>
                     </Binding>
                 </TextBox.Text>
@@ -126,8 +127,8 @@
             </ListView.ItemTemplate>
             <ListView.ItemContainerStyle>
                 <Style TargetType="{x:Type ListViewItem}">
-                    <Setter Property="helpers:ViewItemDoubleClickCommand.Command" Value="{Binding ElementName=rootWindow, Path=DataContext.EditParameter}" />
-                    <Setter Property="helpers:ViewItemDoubleClickCommand.CommandParameter" Value="{Binding}" />
+                    <Setter Property="viewHelpers:ViewItemDoubleClickCommand.Command" Value="{Binding ElementName=rootWindow, Path=DataContext.EditParameter}" />
+                    <Setter Property="viewHelpers:ViewItemDoubleClickCommand.CommandParameter" Value="{Binding}" />
                 </Style>
             </ListView.ItemContainerStyle>
         </ListView>