From 3b98907e5ce2bbc7fedc705cf3777ecb81309e69 Mon Sep 17 00:00:00 2001
From: rjindael <me@rjindael.xyz>
Date: Fri, 28 Jul 2023 05:52:57 -0700
Subject: [PATCH] chore: revamp project structure

---
 .../Kiseki.Launcher.Core.projitems                 | 14 --------------
 Kiseki.Launcher.Core/Kiseki.Launcher.Core.shproj   | 13 -------------
 .../Kiseki.Launcher.Windows.csproj                 | 12 ++++--------
 Kiseki.Launcher.Windows/MainWindow.cs              |  3 +--
 .../Controller.cs                                  |  4 ++--
 5 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 Kiseki.Launcher.Core/Kiseki.Launcher.Core.projitems
 delete mode 100644 Kiseki.Launcher.Core/Kiseki.Launcher.Core.shproj
 rename {Kiseki.Launcher.Core => Kiseki.Launcher}/Controller.cs (98%)

diff --git a/Kiseki.Launcher.Core/Kiseki.Launcher.Core.projitems b/Kiseki.Launcher.Core/Kiseki.Launcher.Core.projitems
deleted file mode 100644
index 1dc91cb..0000000
--- a/Kiseki.Launcher.Core/Kiseki.Launcher.Core.projitems
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>9da0f813-6151-496b-b907-c94a7b6a3889</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Kiseki.Launcher.Core</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)Controller.cs" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Kiseki.Launcher.Core/Kiseki.Launcher.Core.shproj b/Kiseki.Launcher.Core/Kiseki.Launcher.Core.shproj
deleted file mode 100644
index 0656f39..0000000
--- a/Kiseki.Launcher.Core/Kiseki.Launcher.Core.shproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>9da0f813-6151-496b-b907-c94a7b6a3889</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="Kiseki.Launcher.Core.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
diff --git a/Kiseki.Launcher.Windows/Kiseki.Launcher.Windows.csproj b/Kiseki.Launcher.Windows/Kiseki.Launcher.Windows.csproj
index 35b0f3d..3b65fa4 100644
--- a/Kiseki.Launcher.Windows/Kiseki.Launcher.Windows.csproj
+++ b/Kiseki.Launcher.Windows/Kiseki.Launcher.Windows.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <PublishSingleFile>true</PublishSingleFile>
     <UseWindowsForms>true</UseWindowsForms>
@@ -40,11 +40,7 @@
     </None>
   </ItemGroup>
 
-  <Target Name="Rename" AfterTargets="AfterBuild">
-    <Move SourceFiles="$(OUTDIR)\Kiseki.Launcher.Windows.exe" DestinationFiles="$(OUTDIR)\Kiseki.Launcher.exe" />
-    <Move SourceFiles="$(OUTDIR)\Kiseki.Launcher.Windows.pdb" DestinationFiles="$(OUTDIR)\Kiseki.Launcher.pdb" />
-  </Target>
-
-  <Import Project="..\Kiseki.Launcher.Core\Kiseki.Launcher.Core.projitems" Label="Shared" />
-
+  <ItemGroup>
+    <Compile Include="..\Kiseki.Launcher\*.cs" LinkBase="Shared" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Kiseki.Launcher.Windows/MainWindow.cs b/Kiseki.Launcher.Windows/MainWindow.cs
index fbb6c72..460f031 100644
--- a/Kiseki.Launcher.Windows/MainWindow.cs
+++ b/Kiseki.Launcher.Windows/MainWindow.cs
@@ -1,5 +1,4 @@
 using Kiseki.Launcher.Windows.Properties;
-using Kiseki.Launcher.Core;
 
 namespace Kiseki.Launcher.Windows
 {
@@ -27,7 +26,7 @@ namespace Kiseki.Launcher.Windows
                 Buttons = { this.CloseButton }
             };
 
-            this.Controller = new Controller("kiseki.lol", args);
+            this.Controller = new Launcher.Controller("kiseki.lol", args);
             this.Controller.PageHeadingChanged += Controller_PageHeadingChanged;
             this.Controller.ProgressBarChanged += Controller_ProgressBarChanged;
             this.Controller.ProgressBarStateChanged += Controller_ProgressBarStateChanged;
diff --git a/Kiseki.Launcher.Core/Controller.cs b/Kiseki.Launcher/Controller.cs
similarity index 98%
rename from Kiseki.Launcher.Core/Controller.cs
rename to Kiseki.Launcher/Controller.cs
index 955a537..2362cf7 100644
--- a/Kiseki.Launcher.Core/Controller.cs
+++ b/Kiseki.Launcher/Controller.cs
@@ -1,4 +1,4 @@
-namespace Kiseki.Launcher.Core
+namespace Kiseki.Launcher
 {
     public enum ProgressBarState
     {
@@ -88,4 +88,4 @@
             Launched.Invoke(this, EventArgs.Empty);
         }
     }
-}
+}
\ No newline at end of file