From 687b745b4d25baff108624d4d48130921adc298a Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Fri, 28 Nov 2025 08:15:58 +0100
Subject: [PATCH] Upgrade to .net10 and Visual Studio 2026; StockTaking in
 progress...

---
 .../AyCode.Blazor.Components.csproj.bak       | 53 -------------------
 AyCode.Maui.Core/AyCode.Maui.Core.csproj      | 18 ++++---
 AyCode.Project.targets                        |  5 +-
 3 files changed, 14 insertions(+), 62 deletions(-)
 delete mode 100644 AyCode.Blazor.Components/AyCode.Blazor.Components.csproj.bak

diff --git a/AyCode.Blazor.Components/AyCode.Blazor.Components.csproj.bak b/AyCode.Blazor.Components/AyCode.Blazor.Components.csproj.bak
deleted file mode 100644
index 9579150..0000000
--- a/AyCode.Blazor.Components/AyCode.Blazor.Components.csproj.bak
+++ /dev/null
@@ -1,53 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-
-  <ItemGroup>
-    <SupportedPlatform Include="browser" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DevExpress.Blazor" Version="23.2.3" />
-    <PackageReference Include="DevExpress.Blazor.Dashboard" Version="23.2.3" />
-    <PackageReference Include="MessagePack" Version="2.5.168" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="8.0.6" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="AyCode.Core">
-      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\TIAM\Debug\net9.0\AyCode.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Entities">
-      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\TIAM\Debug\net9.0\AyCode.Entities.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Interfaces">
-      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\TIAM\Debug\net9.0\AyCode.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Models">
-      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\TIAM\Debug\net9.0\AyCode.Models.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Services">
-      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\TIAM\Debug\net9.0\AyCode.Services.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Utils">
-      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\TIAM\Debug\net9.0\AyCode.Utils.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Layouts\" />
-    <Folder Include="Pages\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\AyCode.Blazor.Models\AyCode.Blazor.Models.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/AyCode.Maui.Core/AyCode.Maui.Core.csproj b/AyCode.Maui.Core/AyCode.Maui.Core.csproj
index 069b79f..728bf21 100644
--- a/AyCode.Maui.Core/AyCode.Maui.Core.csproj
+++ b/AyCode.Maui.Core/AyCode.Maui.Core.csproj
@@ -3,21 +3,25 @@
 	<Import Project="..//AyCode.Maui.targets" />
 
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net9.0-maccatalyst;net9.0-ios;net9.0-android35.0</TargetFrameworks>
+		<TargetFrameworks>net10.0;net10.0-maccatalyst;net10.0-ios;net10.0-android36.0</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);net9.0-tizen</TargetFrameworks> -->
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">31.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)')) == 'android'">33.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
+		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</TargetPlatformMinVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
+	<PropertyGroup>
+	  <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.26100.0</TargetFrameworks>
+	</PropertyGroup>
+
 	<ItemGroup>
 	  <PackageReference Include="MessagePack" Version="3.1.4" />
 	  <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.10" />
@@ -46,11 +50,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Update="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.120" />
+	  <PackageReference Update="Microsoft.AspNetCore.Components.WebView.Maui" Version="10.0.11" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Update="Microsoft.Maui.Controls" Version="9.0.120" />
+	  <PackageReference Update="Microsoft.Maui.Controls" Version="10.0.11" />
 	</ItemGroup>
 
 </Project>
diff --git a/AyCode.Project.targets b/AyCode.Project.targets
index aaba675..9a54dfc 100644
--- a/AyCode.Project.targets
+++ b/AyCode.Project.targets
@@ -3,7 +3,8 @@
 		<Name>AyCode.Project.targets</Name>
 
 		<_ProjectName>FruitBank</_ProjectName>
-		<_TargetFramework>net9.0</_TargetFramework>
+		<_TargetFramework>net10.0</_TargetFramework>
+		<_TargetFrameworkAyCodeCore>net9.0</_TargetFrameworkAyCodeCore>
 
 		<!--<GitBranch>$([System.IO.File]::ReadAlltext('$(MsBuildThisFileDirectory)\.git\HEAD').Replace('ref: refs/heads/', '').Trim())</GitBranch>
 		<_ProjectName>$(GitBranch)</_ProjectName>-->
@@ -13,7 +14,7 @@
 		<Configurations>Debug;Release;Product</Configurations>
 
 		<BaseOutputPath>bin\$(_ProjectName)</BaseOutputPath>
-		<_AyCodeCoresReferenceBuildSubPath>$(_ProjectName)\$(Configuration)\$(_TargetFramework)</_AyCodeCoresReferenceBuildSubPath>
+		<_AyCodeCoresReferenceBuildSubPath>$(_ProjectName)\$(Configuration)\$(_TargetFrameworkAyCodeCore)</_AyCodeCoresReferenceBuildSubPath>
 	</PropertyGroup>
 
 	<Target Name="Test" AfterTargets="AfterBuild">