From 00463d4a942a370b3d6930aa5904ebaf5080d738 Mon Sep 17 00:00:00 2001
From: "waffle.lord" <waffle.lord@hotmail.com>
Date: Thu, 7 Mar 2024 15:56:40 -0500
Subject: [PATCH] update patch gen/client to net 8

---
 Patcher/.idea/.idea.Patcher/.idea/avalonia.xml   |  1 +
 Patcher/PatchClient/PatchClient.csproj           |  6 +++---
 Patcher/PatchClient/Views/MainWindow.axaml.cs    |  3 ---
 Patcher/PatchGenerator/PatchGenerator.csproj     | 10 ++++++----
 Patcher/PatchGenerator/Resources/PatchClient.exe |  4 ++--
 Patcher/PatchGenerator/Views/MainWindow.axaml.cs |  3 ---
 Patcher/PatcherUtils/PatcherUtils.csproj         |  4 +++-
 7 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Patcher/.idea/.idea.Patcher/.idea/avalonia.xml b/Patcher/.idea/.idea.Patcher/.idea/avalonia.xml
index 49f50b2..084bf92 100644
--- a/Patcher/.idea/.idea.Patcher/.idea/avalonia.xml
+++ b/Patcher/.idea/.idea.Patcher/.idea/avalonia.xml
@@ -5,6 +5,7 @@
       <map>
         <entry key="PatchClient/Views/MainWindow.axaml" value="PatchClient/PatchClient.csproj" />
         <entry key="PatchGenerator/Views/MainWindow.axaml" value="PatchGenerator/PatchGenerator.csproj" />
+        <entry key="PatchGenerator/Views/OptionsView.axaml" value="PatchGenerator/PatchGenerator.csproj" />
       </map>
     </option>
   </component>
diff --git a/Patcher/PatchClient/PatchClient.csproj b/Patcher/PatchClient/PatchClient.csproj
index 90d23d4..8f005df 100644
--- a/Patcher/PatchClient/PatchClient.csproj
+++ b/Patcher/PatchClient/PatchClient.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>2.10.2</AssemblyVersion>
-    <FileVersion>2.10.2</FileVersion>
+    <AssemblyVersion>2.11.0</AssemblyVersion>
+    <FileVersion>2.11.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
diff --git a/Patcher/PatchClient/Views/MainWindow.axaml.cs b/Patcher/PatchClient/Views/MainWindow.axaml.cs
index 1f88916..1dddb35 100644
--- a/Patcher/PatchClient/Views/MainWindow.axaml.cs
+++ b/Patcher/PatchClient/Views/MainWindow.axaml.cs
@@ -11,9 +11,6 @@ namespace PatchClient.Views
         public MainWindow()
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
 
         private void InitializeComponent()
diff --git a/Patcher/PatchGenerator/PatchGenerator.csproj b/Patcher/PatchGenerator/PatchGenerator.csproj
index ac6becd..1349aa8 100644
--- a/Patcher/PatchGenerator/PatchGenerator.csproj
+++ b/Patcher/PatchGenerator/PatchGenerator.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>2.10.2</AssemblyVersion>
-    <FileVersion>2.10.2</FileVersion>
+    <AssemblyVersion>2.11.0</AssemblyVersion>
+    <FileVersion>2.11.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -28,7 +28,6 @@
 
   <ItemGroup>
     <EmbeddedResource Include="Resources\7za.exe" />
-    <EmbeddedResource Include="Resources\PatchClient.exe" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="0.10.11" />
@@ -42,4 +41,7 @@
       <DependentUpon>%(Filename)</DependentUpon>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\PatchClient.exe" />
+  </ItemGroup>
 </Project>
diff --git a/Patcher/PatchGenerator/Resources/PatchClient.exe b/Patcher/PatchGenerator/Resources/PatchClient.exe
index aa98b0f..3ec4ad5 100644
--- a/Patcher/PatchGenerator/Resources/PatchClient.exe
+++ b/Patcher/PatchGenerator/Resources/PatchClient.exe
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:232ada1ba713252985713bc85f12c721f9497ec367524f07c33a4ebf4d0281a4
-size 102628809
+oid sha256:49e41f7156548a1170e5bf4bf354bea9ca39de7015f0edc658641837998fe378
+size 92860625
diff --git a/Patcher/PatchGenerator/Views/MainWindow.axaml.cs b/Patcher/PatchGenerator/Views/MainWindow.axaml.cs
index 2af0cec..09b5b8c 100644
--- a/Patcher/PatchGenerator/Views/MainWindow.axaml.cs
+++ b/Patcher/PatchGenerator/Views/MainWindow.axaml.cs
@@ -11,9 +11,6 @@ namespace PatchGenerator.Views
         public MainWindow()
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
 
         private void InitializeComponent()
diff --git a/Patcher/PatcherUtils/PatcherUtils.csproj b/Patcher/PatcherUtils/PatcherUtils.csproj
index 08c5334..57898b3 100644
--- a/Patcher/PatcherUtils/PatcherUtils.csproj
+++ b/Patcher/PatcherUtils/PatcherUtils.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
+    <AssemblyVersion>2.11.0</AssemblyVersion>
+    <FileVersion>2.11.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>