Skip to content

Upgrade ChateoApp to net10.0 #14

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 ChateoApp to net10.0 #14

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 ChateoApp/Chateo.Server/Chateo.Server.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.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions ChateoApp/Chateo.Services/Chateo.Services.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>
<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
<TargetFrameworks>net10.0-android;net10.0-ios</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UseMaui>true</UseMaui>
Expand All @@ -15,8 +15,8 @@
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.50" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.50" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ChateoApp/Chateo.Shared/Chateo.Shared.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>
</PropertyGroup>
Expand Down
16 changes: 8 additions & 8 deletions ChateoApp/Chateo/Chateo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
<TargetFrameworks>net10.0-android;net10.0-ios</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
<OutputType>Exe</OutputType>
Expand All @@ -17,8 +17,8 @@
<!-- 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)')) == '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>
Expand Down Expand Up @@ -47,15 +47,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.50" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.50" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
</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" />
<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>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions ChateoApp/Chateo/MauiProgram.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ public static MauiApp CreateMauiApp()
var builder = MauiApp.CreateBuilder();
builder
.UseMauiReactorApp<MainPage>()
#if DEBUG
.EnableMauiReactorHotReload()
#endif
.ConfigureFonts(fonts =>
{
fonts.AddFont("Mulish-Regular.ttf", "MulishRegular");
Expand Down
3 changes: 2 additions & 1 deletion ChateoApp/Chateo/Pages/AvatarPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Chateo.Resources.Styles;
using MauiReactor;
using MauiReactor;
using Theme = Chateo.Resources.Styles.Theme;
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
3 changes: 2 additions & 1 deletion ChateoApp/Chateo/Pages/ChatsPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
using Chateo.Services;
using Chateo.Shared;
using Humanizer;
using MauiReactor;
using MauiReactor;
using Theme = Chateo.Resources.Styles.Theme;
using MauiReactor.Shapes;
using Microsoft.Extensions.DependencyInjection;
using System;
Expand Down
3 changes: 2 additions & 1 deletion ChateoApp/Chateo/Pages/Components/TabBarComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Chateo.Resources.Styles;
using MauiReactor;
using MauiReactor;
using Theme = Chateo.Resources.Styles.Theme;
using MauiReactor.Shapes;
using System;
using System.Collections.Generic;
Expand Down
3 changes: 2 additions & 1 deletion ChateoApp/Chateo/Pages/ContactsPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
using Chateo.Services;
using Chateo.Shared;
using Humanizer;
using MauiReactor;
using MauiReactor;
using Theme = Chateo.Resources.Styles.Theme;
using MauiReactor.Shapes;
using Microsoft.Extensions.DependencyInjection;
using System;
Expand Down
1 change: 1 addition & 0 deletions ChateoApp/Chateo/Pages/HomePage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Chateo.Pages.Components;
using Chateo.Resources.Styles;
using MauiReactor;
using Theme = Chateo.Resources.Styles.Theme;
using System;

namespace Chateo.Pages;
Expand Down
1 change: 1 addition & 0 deletions ChateoApp/Chateo/Pages/LandingPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Chateo.Resources.Styles;
using MauiReactor;
using Theme = Chateo.Resources.Styles.Theme;
using System;

namespace Chateo.Pages;
Expand Down
1 change: 1 addition & 0 deletions ChateoApp/Chateo/Pages/MainPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Chateo.Services;
using Chateo.Shared;
using MauiReactor;
using Theme = Chateo.Resources.Styles.Theme;
using MauiReactor.Parameters;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Maui.Storage;
Expand Down
1 change: 1 addition & 0 deletions ChateoApp/Chateo/Pages/RegisterPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Chateo.Services;
using Chateo.Shared;
using MauiReactor;
using Theme = Chateo.Resources.Styles.Theme;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Maui.Storage;
using System;
Expand Down
3 changes: 2 additions & 1 deletion ChateoApp/Chateo/Pages/SettingsPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Chateo.Pages.Components;
using Chateo.Resources.Styles;
using MauiReactor;
using MauiReactor;
using Theme = Chateo.Resources.Styles.Theme;
using MauiReactor.Shapes;
using System;
using System.Collections.Generic;
Expand Down
1 change: 1 addition & 0 deletions ChateoApp/Chateo/Pages/UserChatPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Chateo.Shared;
using Humanizer;
using MauiReactor;
using Theme = Chateo.Resources.Styles.Theme;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Maui.Controls.PlatformConfiguration;
using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
Expand Down