Skip to content

Commit 17b7a44

Browse files
Merge pull request #52 from CodebreakerApp/50-winui-net-8-upgrade
50 winui net 8 upgrade
2 parents 556ebd3 + 9c64dba commit 17b7a44

2 files changed

Lines changed: 14 additions & 26 deletions

File tree

src/Codebreaker.WinUI/App.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public partial class App : Application
6969
services.AddScoped<AuthPageViewModel>();
7070
services.AddTransient<AuthPage>();
7171

72-
string apiBase = context.Configuration["ApiBase"] ?? throw new ConfigurationNotFoundException("ApiBase");
72+
string apiBase = context.Configuration["ApiBase"] ?? throw new InvalidOperationException("ApiBase configuration not found");
7373
services.AddHttpClient<IGameClient, GameClient>((HttpClient client) => client.BaseAddress = new(apiBase));
7474
services.AddScoped<GamePageViewModel>();
7575
services.AddTransient<GamePage>();

src/Codebreaker.WinUI/Codebreaker.WinUI.csproj

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
5+
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
66
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
77
<RootNamespace>CodeBreaker.WinUI</RootNamespace>
88
<ApplicationManifest>app.manifest</ApplicationManifest>
99
<Platforms>x86;x64;arm64</Platforms>
10-
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
11-
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
10+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
1211
<UseWinUI>true</UseWinUI>
1312
<ImplicitUsings>enable</ImplicitUsings>
14-
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
13+
<EnableMsixTooling>true</EnableMsixTooling>
14+
<Nullable>enable</Nullable>
1515
<Company>CN innovation</Company>
1616
</PropertyGroup>
1717
<PropertyGroup Label="MultilingualAppToolkit">
@@ -20,21 +20,7 @@
2020
<TranslationReport Condition="'$(Configuration)' == 'Release'">true</TranslationReport>
2121
<SuppressPseudoWarning Condition="'$(Configuration)' == 'Debug'">true</SuppressPseudoWarning>
2222
</PropertyGroup>
23-
<ItemGroup>
24-
<None Remove="appsettings.Development.json" />
25-
<None Remove="appsettings.json" />
26-
<None Remove="appsettings.Production.json" />
27-
<None Remove="MainWindow.xaml" />
28-
<None Remove="MultilingualResources\CodeBreaker.WinUI.de.xlf" />
29-
<None Remove="Styles\CodeBreakerTemplates.xaml" />
30-
<None Remove="Views\AuthPage.xaml" />
31-
<None Remove="Views\Components\InfoBarMessages.xaml" />
32-
<None Remove="Views\KeyPegsView.xaml" />
33-
<None Remove="Views\LivePage.xaml" />
34-
<None Remove="Views\Pages\AccountPage.xaml" />
35-
<None Remove="Views\Pages\SettingsPage.xaml" />
36-
<None Remove="Views\PegSelectionView.xaml" />
37-
</ItemGroup>
23+
3824
<ItemGroup>
3925
<Manifest Include="$(ApplicationManifest)" />
4026
</ItemGroup>
@@ -64,15 +50,17 @@
6450
</ItemGroup>
6551
<ItemGroup>
6652
<!--<PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="2.0.0-beta1.12" />-->
67-
<PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="2.0.1-beta.1.21" />
53+
<PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="2.0.1-beta.1.22" />
6854
<PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
6955
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
70-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
71-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
72-
<PackageReference Include="Microsoft.Identity.Client" Version="4.50.0" />
73-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230724000" />
74-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
56+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0-rc.2.23479.6" />
57+
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.2.23479.6" />
58+
<PackageReference Include="Microsoft.Identity.Client" Version="4.57.0" />
59+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
60+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.25936-preview" />
7561
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
62+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
63+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
7664
<PackageReference Include="WinUIEx" Version="2.3.2" />
7765
</ItemGroup>
7866
<ItemGroup>

0 commit comments

Comments
 (0)