Merge pull request #52 from CodebreakerApp/50-winui-net-8-upgrade

50 winui net 8 upgrade
CodebreakerApp · Oct 21, 2023 · 17b7a44 · 17b7a44
2 parents 556ebd3 + 9c64dba
commit 17b7a44
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 26 deletions.
diff --git 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>();

diff --git a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
@@ -2,16 +2,16 @@
 <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>
-    <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
     <ImplicitUsings>enable</ImplicitUsings>
-    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnableMsixTooling>true</EnableMsixTooling>
+    <Nullable>enable</Nullable>
     <Company>CN innovation</Company>
   </PropertyGroup>
   <PropertyGroup Label="MultilingualAppToolkit">
@@ -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>
@@ -64,15 +50,17 @@
   </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="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>