From 0c85e6a8d99f9c3a1b335caa4ba805e49e83bacc Mon Sep 17 00:00:00 2001
From: Alex Macocian <amacocian@yahoo.com>
Date: Fri, 1 Aug 2025 16:15:41 +0200
Subject: [PATCH] Restructure project

---
 WpfExtended.Blazor/WpfExtended.Blazor.csproj  |  4 ++--
 WpfExtended.Shared/WpfExtended.Shared.csproj  | 23 -------------------
 WpfExtended.sln                               |  6 -----
 .../Extensions/DependencyObjectExtensions.cs  |  0
 .../DependencyPropertyExtensions.cs           |  0
 .../Extensions/FrameworkElementExtensions.cs  |  0
 .../Launch/ExtendedApplication.cs             |  0
 .../IApplicationLifetimeService.cs            |  0
 WpfExtended/WpfExtended.csproj                | 12 ++++++++--
 9 files changed, 12 insertions(+), 33 deletions(-)
 delete mode 100644 WpfExtended.Shared/WpfExtended.Shared.csproj
 rename {WpfExtended.Shared => WpfExtended}/Extensions/DependencyObjectExtensions.cs (100%)
 rename {WpfExtended.Shared => WpfExtended}/Extensions/DependencyPropertyExtensions.cs (100%)
 rename {WpfExtended.Shared => WpfExtended}/Extensions/FrameworkElementExtensions.cs (100%)
 rename {WpfExtended.Shared => WpfExtended}/Launch/ExtendedApplication.cs (100%)
 rename {WpfExtended.Shared => WpfExtended}/Services/ApplicationLifetime/IApplicationLifetimeService.cs (100%)

diff --git a/WpfExtended.Blazor/WpfExtended.Blazor.csproj b/WpfExtended.Blazor/WpfExtended.Blazor.csproj
index ca858e0..e775172 100644
--- a/WpfExtended.Blazor/WpfExtended.Blazor.csproj
+++ b/WpfExtended.Blazor/WpfExtended.Blazor.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net9.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.7.14</Version>
+    <Version>0.7.15</Version>
     <LangVersion>latest</LangVersion>
     <Description>
       Extension library for Blazor Hybrid running on Windows Presentation Platform.
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WpfExtended.Shared\WpfExtended.Shared.csproj" />
+    <ProjectReference Include="..\WpfExtended\WpfExtended.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/WpfExtended.Shared/WpfExtended.Shared.csproj b/WpfExtended.Shared/WpfExtended.Shared.csproj
deleted file mode 100644
index c636504..0000000
--- a/WpfExtended.Shared/WpfExtended.Shared.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0-windows</TargetFramework>
-    <UseWPF>true</UseWPF>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <RootNamespace>WpfExtended</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CorrelationVector" Version="1.0.42" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.7" />
-    <PackageReference Include="Slim" Version="1.11.2" />
-    <PackageReference Include="Slim.Integration" Version="1.0.4" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageReference Include="SystemExtensions.NetStandard" Version="1.6.12" />
-    <PackageReference Include="SystemExtensions.NetStandard.DependencyInjection" Version="1.6.9" />
-  </ItemGroup>
-
-</Project>
diff --git a/WpfExtended.sln b/WpfExtended.sln
index 0df5d7b..f13132d 100644
--- a/WpfExtended.sln
+++ b/WpfExtended.sln
@@ -17,8 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\workflows\ci.yaml = .github\workflows\ci.yaml
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfExtended.Shared", "WpfExtended.Shared\WpfExtended.Shared.csproj", "{024E4EF3-535E-4371-B2E6-AFBA9812F880}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +39,6 @@ Global
 		{F9BEE9F3-E1AC-448D-AA5F-7C7AA67CA683}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F9BEE9F3-E1AC-448D-AA5F-7C7AA67CA683}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F9BEE9F3-E1AC-448D-AA5F-7C7AA67CA683}.Release|Any CPU.Build.0 = Release|Any CPU
-		{024E4EF3-535E-4371-B2E6-AFBA9812F880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{024E4EF3-535E-4371-B2E6-AFBA9812F880}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{024E4EF3-535E-4371-B2E6-AFBA9812F880}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{024E4EF3-535E-4371-B2E6-AFBA9812F880}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/WpfExtended.Shared/Extensions/DependencyObjectExtensions.cs b/WpfExtended/Extensions/DependencyObjectExtensions.cs
similarity index 100%
rename from WpfExtended.Shared/Extensions/DependencyObjectExtensions.cs
rename to WpfExtended/Extensions/DependencyObjectExtensions.cs
diff --git a/WpfExtended.Shared/Extensions/DependencyPropertyExtensions.cs b/WpfExtended/Extensions/DependencyPropertyExtensions.cs
similarity index 100%
rename from WpfExtended.Shared/Extensions/DependencyPropertyExtensions.cs
rename to WpfExtended/Extensions/DependencyPropertyExtensions.cs
diff --git a/WpfExtended.Shared/Extensions/FrameworkElementExtensions.cs b/WpfExtended/Extensions/FrameworkElementExtensions.cs
similarity index 100%
rename from WpfExtended.Shared/Extensions/FrameworkElementExtensions.cs
rename to WpfExtended/Extensions/FrameworkElementExtensions.cs
diff --git a/WpfExtended.Shared/Launch/ExtendedApplication.cs b/WpfExtended/Launch/ExtendedApplication.cs
similarity index 100%
rename from WpfExtended.Shared/Launch/ExtendedApplication.cs
rename to WpfExtended/Launch/ExtendedApplication.cs
diff --git a/WpfExtended.Shared/Services/ApplicationLifetime/IApplicationLifetimeService.cs b/WpfExtended/Services/ApplicationLifetime/IApplicationLifetimeService.cs
similarity index 100%
rename from WpfExtended.Shared/Services/ApplicationLifetime/IApplicationLifetimeService.cs
rename to WpfExtended/Services/ApplicationLifetime/IApplicationLifetimeService.cs
diff --git a/WpfExtended/WpfExtended.csproj b/WpfExtended/WpfExtended.csproj
index b0bc1a4..402e7cc 100644
--- a/WpfExtended/WpfExtended.csproj
+++ b/WpfExtended/WpfExtended.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net9.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.7.14</Version>
+    <Version>0.7.15</Version>
     <LangVersion>latest</LangVersion>
     <Description>Extension library for Windows Presentation Platform.
 
@@ -82,7 +82,15 @@ http://www.java2s.com/Open-Source/CSharp_Free_Code/Windows_Presentation_Foundati
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WpfExtended.Shared\WpfExtended.Shared.csproj" />
+    <PackageReference Include="Microsoft.CorrelationVector" Version="1.0.42" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.7" />
+    <PackageReference Include="Slim" Version="1.11.2" />
+    <PackageReference Include="Slim.Integration" Version="1.0.4" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+    <PackageReference Include="SystemExtensions.NetStandard" Version="1.6.12" />
+    <PackageReference Include="SystemExtensions.NetStandard.DependencyInjection" Version="1.6.9" />
   </ItemGroup>
 
   <Import Project="ShaderCompiler.target" />