chore: revamp project structure

This commit is contained in:
rjindael 2023-07-28 05:52:57 -07:00
parent 33b49c8571
commit 3b98907e5c
No known key found for this signature in database
GPG Key ID: D069369C906CCF31
5 changed files with 7 additions and 39 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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;

View File

@ -1,4 +1,4 @@
namespace Kiseki.Launcher.Core
namespace Kiseki.Launcher
{
public enum ProgressBarState
{
@ -88,4 +88,4 @@
Launched.Invoke(this, EventArgs.Empty);
}
}
}
}