refactor: move code into src/

.github/workflows/ci-workflow.yml

@@ -16,7 +16,7 @@ jobs:
         with:
           nuget-version: "latest"
       - name: Restore Nuget Packages
-        run: nuget restore XIVLauncher.sln
+        run: nuget restore src\XIVLauncher.sln
       - name: Define VERSION
         run: |
           $env:COMMIT = $env:GITHUB_SHA.Substring(0, 7)
@@ -29,10 +29,11 @@ jobs:
       - name: Build DotNet4 for Release
         run: |
           cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\"
-           .\MSBuild.exe $Env:GITHUB_WORKSPACE\XIVLauncher.sln /t:Build /p:Configuration=Release
+           .\MSBuild.exe $Env:GITHUB_WORKSPACE\src\XIVLauncher.sln /t:Build /p:Configuration=Release
       - name: Build Squirrel Release
         id: build-squirrel
         run: |
+          cd src\
           $releases = Invoke-WebRequest -Uri 'https://api.github.com/repos/goatcorp/FFXIVQuickLauncher/releases'
           $current = ConvertFrom-Json -InputObject $releases.Content | Select-Object -First 1
           $refver = $env:GITHUB_REF -replace '.*/'
@@ -80,7 +81,7 @@ jobs:
         with:
           nuget-version: "latest"
       - name: Restore Nuget Packages
-        run: nuget restore XIVLauncher.sln
+        run: nuget restore src\XIVLauncher.sln
       - name: Define VERSION
         run: |
           $env:COMMIT = $env:GITHUB_SHA.Substring(0, 7)
@@ -93,9 +94,9 @@ jobs:
       - name: Build DotNet4 Master
         run: |
           cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\"
-           .\MSBuild.exe $Env:GITHUB_WORKSPACE\XIVLauncher.sln /t:Build /p:Configuration=ReleaseNoUpdate
+           .\MSBuild.exe $Env:GITHUB_WORKSPACE\src\XIVLauncher.sln /t:Build /p:Configuration=ReleaseNoUpdate
       - name: Upload artifact
         uses: actions/upload-artifact@master
         with:
           name: xivlauncher-artifact
-          path: bin\
+          path: src\bin\

.gitignore

@@ -252,6 +252,6 @@ paket-files/
 *.sln.iml
 
 # XL Debug dirs
-XIVLauncher/XIVLauncher/app-*
-/XIVLauncher/XIVLauncher
-Update.exe
+src/XIVLauncher/XIVLauncher/app-*
+src/XIVLauncher/XIVLauncher
+src/Update.exe

XIVLauncher.PatchInstaller/XIVLauncher.PatchInstaller.csproj → src/XIVLauncher.PatchInstaller/XIVLauncher.PatchInstaller.csproj

@@ -1,40 +1,40 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-  <PropertyGroup>
-    <Product>XIVLauncher Patcher</Product>
-    <AssemblyTitle>XIVLauncher Patcher</AssemblyTitle>
-    <Description>
-    This application installs FFXIV patches from XIVLauncher
-    and needs administrator rights to access your game folder.
-    </Description>
-    <VersionPrefix>1.4.0</VersionPrefix>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
-    <UseWPF>true</UseWPF>
-    <LangVersion>latest</LangVersion>
-    <Deterministic>true</Deterministic>
-    <OutputPath>..\bin\</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-  </PropertyGroup>
-
-  <ItemGroup Label="Assets">
-    <Resource Include="Resources/*.*" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <ApplicationIcon>Resources/icon.ico</ApplicationIcon>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="Serilog" Version="2.9.0" />
-    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="Serilog.Sinks.Debug" Version="1.0.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
-    <PackageReference Include="ZetaIpc" Version="1.0.0.11" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <PropertyGroup>
+    <Product>XIVLauncher Patcher</Product>
+    <AssemblyTitle>XIVLauncher Patcher</AssemblyTitle>
+    <Description>
+    This application installs FFXIV patches from XIVLauncher
+    and needs administrator rights to access your game folder.
+    </Description>
+    <VersionPrefix>1.4.0</VersionPrefix>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net472</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <LangVersion>latest</LangVersion>
+    <Deterministic>true</Deterministic>
+    <OutputPath>..\bin\</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+
+  <ItemGroup Label="Assets">
+    <Resource Include="Resources/*.*" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <ApplicationIcon>Resources/icon.ico</ApplicationIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Serilog" Version="2.9.0" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
+    <PackageReference Include="Serilog.Sinks.Debug" Version="1.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
+    <PackageReference Include="ZetaIpc" Version="1.0.0.11" />
+  </ItemGroup>
+
+</Project>

XIVLauncher.nuspec → src/XIVLauncher.nuspec

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>XIVLauncher</id>
-    <version>$version$</version>
-    <title>XIVLauncher</title>
-    <authors>goaaats</authors>
-    <owners>goaaats</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <projectUrl>https://github.com/goaaats/FFXIVQuickLauncher</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/goaaats/FFXIVQuickLauncher/master/XIVLauncher/Resources/dalamud_icon.ico</iconUrl>
-    <description>Custom launcher for FINAL FANTASY XIV</description>
-  </metadata>
-
-  <files>
-    <file src="bin\**" target="lib\net45" />
-  </files>
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>XIVLauncher</id>
+    <version>$version$</version>
+    <title>XIVLauncher</title>
+    <authors>goaaats</authors>
+    <owners>goaaats</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <projectUrl>https://github.com/goaaats/FFXIVQuickLauncher</projectUrl>
+    <iconUrl>https://raw.githubusercontent.com/goaaats/FFXIVQuickLauncher/master/XIVLauncher/Resources/dalamud_icon.ico</iconUrl>
+    <description>Custom launcher for FINAL FANTASY XIV</description>
+  </metadata>
+
+  <files>
+    <file src="bin\**" target="lib\net45" />
+  </files>
 </package>

XIVLauncher.sln → src/XIVLauncher.sln

@@ -1,44 +1,44 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29215.179
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XIVLauncher", "XIVLauncher\XIVLauncher.csproj", "{BEB33308-6E15-41F7-ACC8-86BB786E2E56}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XIVLauncher.PatchInstaller", "XIVLauncher.PatchInstaller\XIVLauncher.PatchInstaller.csproj", "{395CDFAB-48F8-4EC5-833D-05F5795A157D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XIVLauncher.Tests", "XIVLauncher.Tests\XIVLauncher.Tests.csproj", "{6B17C1CE-68F5-44EE-98D2-28D9DAA36BE1}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-		ReleaseNoUpdate|Any CPU = ReleaseNoUpdate|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BEB33308-6E15-41F7-ACC8-86BB786E2E56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEB33308-6E15-41F7-ACC8-86BB786E2E56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BEB33308-6E15-41F7-ACC8-86BB786E2E56}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BEB33308-6E15-41F7-ACC8-86BB786E2E56}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BEB33308-6E15-41F7-ACC8-86BB786E2E56}.ReleaseNoUpdate|Any CPU.ActiveCfg = ReleaseNoUpdate|Any CPU
-		{BEB33308-6E15-41F7-ACC8-86BB786E2E56}.ReleaseNoUpdate|Any CPU.Build.0 = ReleaseNoUpdate|Any CPU
-		{395CDFAB-48F8-4EC5-833D-05F5795A157D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{395CDFAB-48F8-4EC5-833D-05F5795A157D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{395CDFAB-48F8-4EC5-833D-05F5795A157D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{395CDFAB-48F8-4EC5-833D-05F5795A157D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{395CDFAB-48F8-4EC5-833D-05F5795A157D}.ReleaseNoUpdate|Any CPU.ActiveCfg = Release|Any CPU
-		{395CDFAB-48F8-4EC5-833D-05F5795A157D}.ReleaseNoUpdate|Any CPU.Build.0 = Release|Any CPU
-		{6B17C1CE-68F5-44EE-98D2-28D9DAA36BE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B17C1CE-68F5-44EE-98D2-28D9DAA36BE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B17C1CE-68F5-44EE-98D2-28D9DAA36BE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B17C1CE-68F5-44EE-98D2-28D9DAA36BE1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B17C1CE-68F5-44EE-98D2-28D9DAA36BE1}.ReleaseNoUpdate|Any CPU.ActiveCfg = Release|Any CPU
-		{6B17C1CE-68F5-44EE-98D2-28D9DAA36BE1}.ReleaseNoUpdate|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D891D6DF-EE64-48EE-9EFD-EB78412638E3}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29215.179
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XIVLauncher", "XIVLauncher\XIVLauncher.csproj", "{BEB33308-6E15-41F7-ACC8-86BB786E2E56}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XIVLauncher.PatchInstaller", "XIVLauncher.PatchInstaller\XIVLauncher.PatchInstaller.csproj", "{395CDFAB-48F8-4EC5-833D-05F5795A157D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XIVLauncher.Tests", "XIVLauncher.Tests\XIVLauncher.Tests.csproj", "{6B17C1CE-68F5-44EE-98D2-28D9DAA36BE1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		ReleaseNoUpdate|Any CPU = ReleaseNoUpdate|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BEB33308-6E15-41F7-ACC8-86BB786E2E56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEB33308-6E15-41F7-ACC8-86BB786E2E56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEB33308-6E15-41F7-ACC8-86BB786E2E56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEB33308-6E15-41F7-ACC8-86BB786E2E56}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEB33308-6E15-41F7-ACC8-86BB786E2E56}.ReleaseNoUpdate|Any CPU.ActiveCfg = ReleaseNoUpdate|Any CPU
+		{BEB33308-6E15-41F7-ACC8-86BB786E2E56}.ReleaseNoUpdate|Any CPU.Build.0 = ReleaseNoUpdate|Any CPU
+		{395CDFAB-48F8-4EC5-833D-05F5795A157D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{395CDFAB-48F8-4EC5-833D-05F5795A157D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{395CDFAB-48F8-4EC5-833D-05F5795A157D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{395CDFAB-48F8-4EC5-833D-05F5795A157D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{395CDFAB-48F8-4EC5-833D-05F5795A157D}.ReleaseNoUpdate|Any CPU.ActiveCfg = Release|Any CPU
+		{395CDFAB-48F8-4EC5-833D-05F5795A157D}.ReleaseNoUpdate|Any CPU.Build.0 = Release|Any CPU
+		{6B17C1CE-68F5-44EE-98D2-28D9DAA36BE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B17C1CE-68F5-44EE-98D2-28D9DAA36BE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B17C1CE-68F5-44EE-98D2-28D9DAA36BE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B17C1CE-68F5-44EE-98D2-28D9DAA36BE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B17C1CE-68F5-44EE-98D2-28D9DAA36BE1}.ReleaseNoUpdate|Any CPU.ActiveCfg = Release|Any CPU
+		{6B17C1CE-68F5-44EE-98D2-28D9DAA36BE1}.ReleaseNoUpdate|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D891D6DF-EE64-48EE-9EFD-EB78412638E3}
+	EndGlobalSection
+EndGlobal

XIVLauncher/Addon/AddonEntry.cs → src/XIVLauncher/Addon/AddonEntry.cs

@@ -1,8 +1,8 @@
-namespace XIVLauncher.Addon
-{
-    public class AddonEntry
-    {
-        public bool IsEnabled { get; set; }
-        public GenericAddon Addon { get; set; }
-    }
+namespace XIVLauncher.Addon
+{
+    public class AddonEntry
+    {
+        public bool IsEnabled { get; set; }
+        public GenericAddon Addon { get; set; }
+    }
 }

XIVLauncher/Addon/IAddon.cs → src/XIVLauncher/Addon/IAddon.cs

@@ -1,12 +1,12 @@
-using System.Diagnostics;
-using XIVLauncher.Settings;
-
-namespace XIVLauncher.Addon
-{
-    public interface IAddon
-    {
-        string Name { get; }
-
-        void Setup(Process gameProcess, ILauncherSettingsV3 setting);
-    }
+using System.Diagnostics;
+using XIVLauncher.Settings;
+
+namespace XIVLauncher.Addon
+{
+    public interface IAddon
+    {
+        string Name { get; }
+
+        void Setup(Process gameProcess, ILauncherSettingsV3 setting);
+    }
 }

XIVLauncher/App.xaml → src/XIVLauncher/App.xaml

@@ -1,34 +1,34 @@
-<Application x:Class="XIVLauncher.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Startup="App_OnStartup">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/materialdesigncolor.Blue.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Blue.xaml" />
-
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ComboBox.xaml" />
-
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml" />
-
-                <!-- Include the Dragablz Material Design style -->
-                <ResourceDictionary Source="pack://application:,,,/Dragablz;component/Themes/materialdesign.xaml"/>                
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-
-    <JumpList.JumpList>
-        <JumpList ShowRecentCategory="False"
-                  ShowFrequentCategory="False">
-            <JumpTask Title="Disable Auto-Login" 
-                      Description="If enabled, disable the Auto-Login functionality to allow for setting changes." 
-                      ApplicationPath="%LocalAppData%\XIVLauncher\XIVLauncher.exe"
-                      IconResourcePath="C:\Windows\System32\shell32.dll"
-                      IconResourceIndex="44"
-                      WorkingDirectory="%LocalAppData%\XIVLauncher"
-                      Arguments="--noautologin"/>
-        </JumpList>
-    </JumpList.JumpList>
-</Application>
+<Application x:Class="XIVLauncher.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Startup="App_OnStartup">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/materialdesigncolor.Blue.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Blue.xaml" />
+
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ComboBox.xaml" />
+
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml" />
+
+                <!-- Include the Dragablz Material Design style -->
+                <ResourceDictionary Source="pack://application:,,,/Dragablz;component/Themes/materialdesign.xaml"/>                
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+
+    <JumpList.JumpList>
+        <JumpList ShowRecentCategory="False"
+                  ShowFrequentCategory="False">
+            <JumpTask Title="Disable Auto-Login" 
+                      Description="If enabled, disable the Auto-Login functionality to allow for setting changes." 
+                      ApplicationPath="%LocalAppData%\XIVLauncher\XIVLauncher.exe"
+                      IconResourcePath="C:\Windows\System32\shell32.dll"
+                      IconResourceIndex="44"
+                      WorkingDirectory="%LocalAppData%\XIVLauncher"
+                      Arguments="--noautologin"/>
+        </JumpList>
+    </JumpList.JumpList>
+</Application>