Skip to content

Upgrade DigitsGame to net10.0 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidortinau wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade DigitsGame to net10.0 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DigitsGame/DigitsGame.Tests/DigitsGame.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UseMaui>true</UseMaui>
Expand Down
146 changes: 73 additions & 73 deletions DigitsGame/DigitsGame/DigitsGame.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<OutputType Condition="'$(TargetFramework)' != 'net8.0'">Exe</OutputType>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
<RootNamespace>DigitsGame</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<!-- Display name -->
<ApplicationTitle>DigitsGame</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.digitsgame</ApplicationId>
<ApplicationIdGuid>25f39401-8c74-4bc9-abeb-61c13bdb1fd7</ApplicationIdGuid>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>
<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />
<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<MauiImage Remove="Resources\Images\add_icon.png" />
<MauiImage Remove="Resources\Images\add_icon_green.png" />
<MauiImage Remove="Resources\Images\divide_icon.png" />
<MauiImage Remove="Resources\Images\divide_icon_green.png" />
<MauiImage Remove="Resources\Images\multiply_icon.png" />
<MauiImage Remove="Resources\Images\multiply_icon_green.png" />
<MauiImage Remove="Resources\Images\subtract_icon.png" />
<MauiImage Remove="Resources\Images\subtract_icon_green.png" />
<MauiImage Remove="Resources\Images\undo_icon.png" />
<MauiImage Remove="Resources\Images\undo_icon_green.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Images\add_icon.png" />
<EmbeddedResource Include="Resources\Images\add_icon_green.png" />
<EmbeddedResource Include="Resources\Images\divide_icon.png" />
<EmbeddedResource Include="Resources\Images\divide_icon_green.png" />
<EmbeddedResource Include="Resources\Images\multiply_icon.png" />
<EmbeddedResource Include="Resources\Images\multiply_icon_green.png" />
<EmbeddedResource Include="Resources\Images\subtract_icon.png" />
<EmbeddedResource Include="Resources\Images\subtract_icon_green.png" />
<EmbeddedResource Include="Resources\Images\undo_icon.png" />
<EmbeddedResource Include="Resources\Images\undo_icon_green.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Reactor.Maui" Version="2.0.14-beta" />
<PackageReference Include="Reactor.Maui.Canvas" Version="2.0.14-beta" />
<PackageReference Include="Reactor.Maui.ScaffoldGenerator" Version="2.0.14-beta" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0-android;net10.0-ios;net10.0-maccatalyst;net10.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
<OutputType Condition="'$(TargetFramework)' != 'net10.0'">Exe</OutputType>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net10.0-tizen</TargetFrameworks> -->
<RootNamespace>DigitsGame</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<!-- Display name -->
<ApplicationTitle>DigitsGame</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.digitsgame</ApplicationId>
<ApplicationIdGuid>25f39401-8c74-4bc9-abeb-61c13bdb1fd7</ApplicationIdGuid>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">16.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">16.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>
<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />
<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<MauiImage Remove="Resources\Images\add_icon.png" />
<MauiImage Remove="Resources\Images\add_icon_green.png" />
<MauiImage Remove="Resources\Images\divide_icon.png" />
<MauiImage Remove="Resources\Images\divide_icon_green.png" />
<MauiImage Remove="Resources\Images\multiply_icon.png" />
<MauiImage Remove="Resources\Images\multiply_icon_green.png" />
<MauiImage Remove="Resources\Images\subtract_icon.png" />
<MauiImage Remove="Resources\Images\subtract_icon_green.png" />
<MauiImage Remove="Resources\Images\undo_icon.png" />
<MauiImage Remove="Resources\Images\undo_icon_green.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Images\add_icon.png" />
<EmbeddedResource Include="Resources\Images\add_icon_green.png" />
<EmbeddedResource Include="Resources\Images\divide_icon.png" />
<EmbeddedResource Include="Resources\Images\divide_icon_green.png" />
<EmbeddedResource Include="Resources\Images\multiply_icon.png" />
<EmbeddedResource Include="Resources\Images\multiply_icon_green.png" />
<EmbeddedResource Include="Resources\Images\subtract_icon.png" />
<EmbeddedResource Include="Resources\Images\subtract_icon_green.png" />
<EmbeddedResource Include="Resources\Images\undo_icon.png" />
<EmbeddedResource Include="Resources\Images\undo_icon_green.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.50" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.50" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Reactor.Maui" Version="4.0.16" />
<PackageReference Include="Reactor.Maui.Canvas" Version="4.0.16" />
<PackageReference Include="Reactor.Maui.ScaffoldGenerator" Version="1.0.154" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions DigitsGame/DigitsGame/MauiProgram.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ public static MauiApp CreateMauiApp()
var builder = MauiApp.CreateBuilder();
builder
.UseMauiReactorApp<MainPage>()
#if DEBUG
.EnableMauiReactorHotReload()
#endif
.ConfigureFonts(fonts =>
{
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
Expand Down
4 changes: 2 additions & 2 deletions DigitsGame/DigitsGame/Pages/Components/GameBoardNumberButton.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ public override VisualNode Render()
{
new Ellipse()
.StrokeSize(_isSelected ? 0 : 3)
.StrokeColor(_isSelected ? Theme.GreenColor : Colors.Black)
.StrokeColor(_isSelected ? DigitsGame.Resources.Styles.Theme.GreenColor : Colors.Black)
.StrokeDashPattern(_isSelected ? null : new[] { 3.0f, 2.0f })
.FillColor(_isSelected ? Theme.GreenColor : Colors.White)
.FillColor(_isSelected ? DigitsGame.Resources.Styles.Theme.GreenColor : Colors.White)
,

new Text($"{State.PreviousValue ?? State.Number?.Value}")
Expand Down
4 changes: 2 additions & 2 deletions DigitsGame/DigitsGame/Pages/MainPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ ContentPage RenderOnMobile()
Grid("100,400", "*,*",
Button("Game Board")
.TextColor(currentView == PageView.GameBoard ? Colors.White : Colors.Black)
.BackgroundColor(currentView == PageView.GameBoard ? Theme.GreenColor : Colors.LightGray)
.BackgroundColor(currentView == PageView.GameBoard ? DigitsGame.Resources.Styles.Theme.GreenColor : Colors.LightGray)
.OnClicked(()=>_mainStateParameter?.Set(_ => _.PageView = PageView.GameBoard))
.Margin(10),

Button("Operations")
.TextColor(currentView == PageView.OperationList ? Colors.White : Colors.Black)
.BackgroundColor(currentView == PageView.OperationList ? Theme.GreenColor : Colors.LightGray)
.BackgroundColor(currentView == PageView.OperationList ? DigitsGame.Resources.Styles.Theme.GreenColor : Colors.LightGray)
.OnClicked(()=>_mainStateParameter?.Set(_ => _.PageView = PageView.OperationList))
.GridColumn(1)
.Margin(10),
Expand Down