From 2ecc99c7cc25c48f2d182fbf23024e83d667f544 Mon Sep 17 00:00:00 2001
From: Sebastian Szvetecz <sebastian@szvetecz.at>
Date: Fri, 20 Oct 2023 13:13:18 +0200
Subject: [PATCH 1/8] Updated to .net8.0

---
 src/Codebreaker.WinUI/Codebreaker.WinUI.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
index dc215f0c..beddad54 100644
--- a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
+++ b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
@@ -2,12 +2,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>CodeBreaker.WinUI</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;arm64</Platforms>
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
     <ImplicitUsings>enable</ImplicitUsings>

From d046b0239e1b46a3b217b1c133b044b6efd36172 Mon Sep 17 00:00:00 2001
From: Sebastian Szvetecz <sebastian@szvetecz.at>
Date: Fri, 20 Oct 2023 13:17:11 +0200
Subject: [PATCH 2/8] Removed publish profile

---
 src/Codebreaker.WinUI/Codebreaker.WinUI.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
index beddad54..9384e4e3 100644
--- a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
+++ b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
@@ -8,7 +8,6 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;arm64</Platforms>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-    <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
     <ImplicitUsings>enable</ImplicitUsings>
     <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>

From 7e8eeff2263f25d709fe1fe1cf7bdca2efcc0d1e Mon Sep 17 00:00:00 2001
From: Sebastian Szvetecz <sebastian@szvetecz.at>
Date: Fri, 20 Oct 2023 13:18:23 +0200
Subject: [PATCH 3/8] Replaced PreviewMsixTooling with MsixTooling

---
 src/Codebreaker.WinUI/Codebreaker.WinUI.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
index 9384e4e3..1e35f485 100644
--- a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
+++ b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
@@ -10,7 +10,7 @@
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
     <ImplicitUsings>enable</ImplicitUsings>
-    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnableMsixTooling>true</EnableMsixTooling>
     <Company>CN innovation</Company>
   </PropertyGroup>
   <PropertyGroup Label="MultilingualAppToolkit">

From 20e88508e863f611d7fa6cb627f5213dfc07e78e Mon Sep 17 00:00:00 2001
From: Sebastian Szvetecz <sebastian@szvetecz.at>
Date: Fri, 20 Oct 2023 13:18:37 +0200
Subject: [PATCH 4/8] Enabled nullable feature

---
 src/Codebreaker.WinUI/Codebreaker.WinUI.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
index 1e35f485..f880ab38 100644
--- a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
+++ b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
@@ -11,6 +11,7 @@
     <UseWinUI>true</UseWinUI>
     <ImplicitUsings>enable</ImplicitUsings>
     <EnableMsixTooling>true</EnableMsixTooling>
+    <Nullable>enable</Nullable>
     <Company>CN innovation</Company>
   </PropertyGroup>
   <PropertyGroup Label="MultilingualAppToolkit">

From 847c4f6d7bbe9db90138e110f8db607d8f3b8808 Mon Sep 17 00:00:00 2001
From: Sebastian Szvetecz <sebastian@szvetecz.at>
Date: Fri, 20 Oct 2023 13:19:08 +0200
Subject: [PATCH 5/8] Removed unnecessary itemgroup

---
 src/Codebreaker.WinUI/Codebreaker.WinUI.csproj | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
index f880ab38..01ca8825 100644
--- a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
+++ b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
@@ -20,21 +20,7 @@
     <TranslationReport Condition="'$(Configuration)' == 'Release'">true</TranslationReport>
     <SuppressPseudoWarning Condition="'$(Configuration)' == 'Debug'">true</SuppressPseudoWarning>
   </PropertyGroup>
-  <ItemGroup>
-    <None Remove="appsettings.Development.json" />
-    <None Remove="appsettings.json" />
-    <None Remove="appsettings.Production.json" />
-    <None Remove="MainWindow.xaml" />
-    <None Remove="MultilingualResources\CodeBreaker.WinUI.de.xlf" />
-    <None Remove="Styles\CodeBreakerTemplates.xaml" />
-    <None Remove="Views\AuthPage.xaml" />
-    <None Remove="Views\Components\InfoBarMessages.xaml" />
-    <None Remove="Views\KeyPegsView.xaml" />
-    <None Remove="Views\LivePage.xaml" />
-    <None Remove="Views\Pages\AccountPage.xaml" />
-    <None Remove="Views\Pages\SettingsPage.xaml" />
-    <None Remove="Views\PegSelectionView.xaml" />
-  </ItemGroup>
+  
   <ItemGroup>
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>

From 1bb89d39dcc642f7103f2e64c1ea4ebd05eae06d Mon Sep 17 00:00:00 2001
From: Sebastian Szvetecz <sebastian@szvetecz.at>
Date: Fri, 20 Oct 2023 13:19:26 +0200
Subject: [PATCH 6/8] Updated Nuget-Packages

---
 src/Codebreaker.WinUI/Codebreaker.WinUI.csproj | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
index 01ca8825..9bbd70c7 100644
--- a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
+++ b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
@@ -50,14 +50,14 @@
   </ItemGroup>
   <ItemGroup>
     <!--<PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="2.0.0-beta1.12" />-->
-    <PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="2.0.1-beta.1.21" />
+    <PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="2.0.1-beta.1.22" />
     <PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.50.0" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230724000" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0-rc.2.23479.6" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.2.23479.6" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.57.0" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.25936-preview" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageReference Include="WinUIEx" Version="2.3.2" />
   </ItemGroup>

From bb66cd50fb947b34b7dcde02272a51a02cf0b4e4 Mon Sep 17 00:00:00 2001
From: Sebastian Szvetecz <sebastian@szvetecz.at>
Date: Fri, 20 Oct 2023 13:20:37 +0200
Subject: [PATCH 7/8] Explicitly replaced vulnerable versions of transitive
 dependencies with newest versions

---
 src/Codebreaker.WinUI/Codebreaker.WinUI.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
index 9bbd70c7..af18e858 100644
--- a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
+++ b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
@@ -59,6 +59,8 @@
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.25936-preview" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageReference Include="WinUIEx" Version="2.3.2" />
   </ItemGroup>
   <ItemGroup>

From 9c64dba65101b317c487dce48f26e3fabd27cdb3 Mon Sep 17 00:00:00 2001
From: Sebastian Szvetecz <sebastian@szvetecz.at>
Date: Fri, 20 Oct 2023 13:21:14 +0200
Subject: [PATCH 8/8] Removed usage of unavailable exception type

---
 src/Codebreaker.WinUI/App.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Codebreaker.WinUI/App.xaml.cs b/src/Codebreaker.WinUI/App.xaml.cs
index 6b254460..a8870506 100644
--- a/src/Codebreaker.WinUI/App.xaml.cs
+++ b/src/Codebreaker.WinUI/App.xaml.cs
@@ -69,7 +69,7 @@ public partial class App : Application
             services.AddScoped<AuthPageViewModel>();
             services.AddTransient<AuthPage>();
 
-            string apiBase = context.Configuration["ApiBase"] ?? throw new ConfigurationNotFoundException("ApiBase");
+            string apiBase = context.Configuration["ApiBase"] ?? throw new InvalidOperationException("ApiBase configuration not found");
             services.AddHttpClient<IGameClient, GameClient>((HttpClient client) => client.BaseAddress = new(apiBase));
             services.AddScoped<GamePageViewModel>();
             services.AddTransient<GamePage>();