update net 10

LiveCharts.slnx

@@ -142,10 +142,13 @@
   <Folder Name="/Solution Items/">
     <File Path=".editorconfig" />
     <File Path="Directory.Build.props" />
-    <File Path="global.json" />
   </Folder>
-  <Folder Name="/Solution Items/RenderingSettings/">
+  <Folder Name="/Solution Items/MSBuild/">
+    <File Path="build/NativeSharedLinks.Build.props" />
     <File Path="build/RenderSettings.Build.props" />
+    <File Path="build/SharedLinks.Build.props" />
+    <File Path="build/WinUISharedLinks.Build.props" />
+    <File Path="build/XamlSharedLinks.Build.props" />
   </Folder>
   <Folder Name="/Tests/">
     <Project Path="tests/LiveChartsCore.UnitTesting/LiveChartsCore.UnitTesting.csproj">

build/NativeSharedLinks.Build.props

@@ -0,0 +1,7 @@
+<Project>
+  <ItemGroup>
+    <Compile Include="..\..\_Shared.Native\**\*.cs">
+      <Link>Native\%(RecursiveDir)%(Filename).cs</Link>
+    </Compile>
+  </ItemGroup>
+</Project>

build/SharedLinks.Build.props

@@ -0,0 +1,40 @@
+<Project>
+  <ItemGroup>
+    <Compile Include="..\_Shared\SourceGenChart.*.cs">
+      <Link>%(Filename).cs</Link>
+      <DependentUpon>SourceGenChart.cs</DependentUpon>
+    </Compile>
+
+    <Compile Include="..\_Shared\SourceGenCartesianChart.*.cs">
+      <Link>%(Filename).cs</Link>
+      <DependentUpon>CartesianChart.cs</DependentUpon>
+    </Compile>
+    <Compile Update="SourceGenCartesianChart.*.cs">
+      <DependentUpon>CartesianChart.cs</DependentUpon>
+    </Compile>
+
+    <Compile Include="..\_Shared\SourceGenPieChart.*.cs">
+      <Link>%(Filename).cs</Link>
+      <DependentUpon>PieChart.cs</DependentUpon>
+    </Compile>
+    <Compile Update="SourceGenPieChart.*.cs">
+      <DependentUpon>PieChart.cs</DependentUpon>
+    </Compile>
+
+    <Compile Include="..\_Shared\SourceGenPolarChart.*.cs">
+      <Link>%(Filename).cs</Link>
+      <DependentUpon>PolarChart.cs</DependentUpon>
+    </Compile>
+    <Compile Update="SourceGenPolarChart.*.cs">
+      <DependentUpon>PolarChart.cs</DependentUpon>
+    </Compile>
+
+    <Compile Include="..\_Shared\SourceGenMapChart.*.cs">
+      <Link>%(Filename).cs</Link>
+      <DependentUpon>GeoMap.cs</DependentUpon>
+    </Compile>
+    <Compile Update="SourceGenMapChart.*.cs">
+      <DependentUpon>GeoMap.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+</Project>

build/WinUISharedLinks.Build.props

@@ -0,0 +1,24 @@
+<Project>
+  <ItemGroup>
+    <Compile Include="..\_Shared.WinUI\**\*.cs">
+      <Link>%(RecursiveDir)%(Filename).cs</Link>
+    </Compile>
+
+    <Compile Update="..\_Shared.WinUI\SourceGenCartesianChart.*.cs">
+      <DependentUpon>CartesianChart.cs</DependentUpon>
+    </Compile>
+
+    <Compile Update="..\_Shared.WinUI\SourceGenPieChart.*.cs">
+      <DependentUpon>PieChart.cs</DependentUpon>
+    </Compile>
+
+    <Compile Update="..\_Shared.WinUI\SourceGenPolarChart.*.cs">
+      <DependentUpon>PolarChart.cs</DependentUpon>
+    </Compile>
+
+    <Compile Update="..\_Shared.WinUI\SourceGenMapChart.*.cs">
+      <DependentUpon>GeoMap.cs</DependentUpon>
+    </Compile>
+
+  </ItemGroup>
+</Project>

build/XamlSharedLinks.Build.props

@@ -0,0 +1,7 @@
+<Project>
+  <ItemGroup>
+    <Compile Include="..\_Shared.Xaml\*.cs">
+      <Link>XamlFriendlySourceGenerated\%(Filename).cs</Link>
+    </Compile>
+  </ItemGroup>
+</Project>

samples/AvaloniaSample/AvaloniaSample.csproj

@@ -3,7 +3,7 @@
   <Import Project="../../Directory.Build.props" />
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>$(GlobalLangVersion)</LangVersion>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>

samples/AvaloniaSample/Platforms/AvaloniaSample.Android/AvaloniaSample.Android.csproj

@@ -2,7 +2,7 @@
 
  <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-android</TargetFramework>
+    <TargetFramework>net10.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <ApplicationId>com.CompanyName.AvaloniaSample</ApplicationId>

samples/AvaloniaSample/Platforms/AvaloniaSample.Android/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "WSL": {
+      "commandName": "WSL2",
+      "distributionName": ""
+    }
+  }
+}

samples/AvaloniaSample/Platforms/AvaloniaSample.Browser/AvaloniaSample.Browser.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WebAssembly">
   <PropertyGroup>
-    <TargetFramework>net9.0-browser</TargetFramework>
+    <TargetFramework>net10.0-browser</TargetFramework>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>

samples/AvaloniaSample/Platforms/AvaloniaSample.Desktop/AvaloniaSample.Desktop.csproj

@@ -4,7 +4,7 @@
     <OutputType>WinExe</OutputType>
     <!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
     One for Windows with net8.0-windows TFM, one for MacOS with net80.0-macos and one with net8.0 TFM for Linux.-->
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>

samples/AvaloniaSample/Platforms/AvaloniaSample.iOS/AvaloniaSample.iOS.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0-ios</TargetFramework>
+    <TargetFramework>net10.0-ios</TargetFramework>
     <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>

samples/BlazorSample/BlazorSample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -19,8 +19,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.6" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.1" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

samples/EtoFormsSample/EtoFormsSample.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Eto.Forms/2.6.0">
+<Project Sdk="Eto.Forms/2.10.2">
 
   <!--
     Set the BuildPlatform property to the Eto platform you wish to build for.
@@ -8,7 +8,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <!--
     <BuildPlatform>Windows</BuildPlatform>
     <BuildPlatform>Gtk</BuildPlatform>
@@ -39,5 +39,5 @@
   <ItemGroup Condition="!$(UseNuGetForSamples)">
     <ProjectReference Include="..\..\src\skiasharp\LiveChartsCore.SkiaSharpView.Eto\LiveChartsCore.SkiaSharpView.Eto.csproj" />
   </ItemGroup>
-
+  
 </Project>

samples/MauiSample/MauiSample.csproj

@@ -3,8 +3,8 @@
 	<PropertyGroup>
     <Nullable>enable</Nullable>
     <LangVersion>$(GlobalLangVersion)</LangVersion>
-    <TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks>net10.0-android;net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.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);net8.0-tizen</TargetFrameworks> -->
 
@@ -38,6 +38,8 @@
     <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>
+
+    <!--<WindowsPackageType>None</WindowsPackageType>-->
 	</PropertyGroup>
 
   <ItemGroup>
@@ -59,9 +61,9 @@
 
 	<ItemGroup>
 	  <ProjectReference Include="..\ViewModelsSamples\ViewModelsSamples.csproj" />
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.90" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.90" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+    <!--<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MauiVersion)" />-->
 	</ItemGroup>
 
   <ItemGroup Condition="$(UseNuGetForSamples)">

samples/UnoPlatformSample/UnoPlatformSample/UnoPlatformSample.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Uno.Sdk">
+<Project Sdk="Uno.Sdk/6.4.42">
     <PropertyGroup>
-        <TargetFrameworks>net9.0-android;net9.0-ios;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop</TargetFrameworks>
+        <TargetFrameworks>net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop</TargetFrameworks>
 
         <OutputType>Exe</OutputType>
         <UnoSingleProject>true</UnoSingleProject>

samples/VorticeSample/LiveChartsCore.Vortice/Hack.cs

@@ -1,4 +1,5 @@
 namespace LiveChartsCore.SkiaSharpView.TypeConverters; // hack ns to make source genetation happy.
+
 internal class Hack
 {
 }

samples/VorticeSample/LiveChartsCore.Vortice/LiveChartsCore.Vortice.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <LangVersion>$(GlobalLangVersion)</LangVersion>
-    <TargetFramework>net9.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -17,4 +17,10 @@
 
   <Import Project="..\..\..\src\skiasharp\_Shared\_Shared.projitems" Label="Shared" />
 
+  <ItemGroup>
+    <!-- maps are not decoupled from skiasharp :( for now not supported. -->
+    <Compile Remove="..\..\..\src\skiasharp\_Shared\SourceGenMapChart.cs" />
+    <Compile Remove="..\..\..\src\skiasharp\_Shared\SourceGenMapChart.sgp.cs" />
+  </ItemGroup>
+
 </Project>

samples/VorticeSample/VorticeSample/VorticeSample.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net9.0-windows</TargetFrameworks>
+    <TargetFrameworks>net10.0-windows</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/LiveChartsCore/LiveChartsCore.csproj

@@ -7,7 +7,6 @@
     <TargetFrameworks>
       net462;
       netstandard2.0;
-      netstandard2.1;
       net8.0;
     </TargetFrameworks>
 

src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/CartesianChart.cs

@@ -25,10 +25,11 @@
 namespace LiveChartsCore.SkiaSharpView.Avalonia;
 
 // ==============================================================================
-// 
-// use the LiveChartsGeneratedCode.SourceGenCartesianChart class to add avalonia specific
-// code, this class is just to expose the CartesianChart class in this namespace.
-// 
+// this file exposes the control at this namespace.
+// to see the code expand this file in the solution explorer, it will include 3 files:
+//    - *.uiFramework.cs:   The UI framework specific code
+//    - *.shared.cs:        shared code between all UI frameworks
+//    - *.sgp.cs:           the source generated properties
 // ==============================================================================
 
 /// <inheritdoc cref="ICartesianChartView" />

src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/GeoMap.cs

@@ -23,10 +23,11 @@
 using LiveChartsCore.Geo;
 
 // ==============================================================================
-// 
-// use the LiveChartsGeneratedCode.SourceGenMapChart class to add avalonia specific
-// code, this class is just to expose the GeoMap class in this namespace.
-// 
+// this file exposes the control at this namespace.
+// to see the code expand this file in the solution explorer, it will include 3 files:
+//    - *.uiFramework.cs:   The UI framework specific code
+//    - *.shared.cs:        shared code between all UI frameworks
+//    - *.sgp.cs:           the source generated properties
 // ==============================================================================
 
 namespace LiveChartsCore.SkiaSharpView.Avalonia;

src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsCore.SkiaSharpView.Avalonia.csproj

@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <LangVersion>$(GlobalLangVersion)</LangVersion>
     <Nullable>enable</Nullable>
 
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0;</TargetFrameworks>
 
     <AssemblyName>LiveChartsCore.SkiaSharpView.Avalonia</AssemblyName>
     <RootNamespace>LiveChartsCore.SkiaSharpView.Avalonia</RootNamespace>
@@ -28,8 +28,8 @@
     <DebugType>embedded</DebugType>-->
   </PropertyGroup>
 
-  <Import Project="..\_Shared\_Shared.projitems" Label="Shared" />
-  <Import Project="..\_Shared.Xaml\_Shared.Xaml.projitems" Label="Shared" />
+  <Import Project="..\..\..\build\SharedLinks.Build.props" />
+  <Import Project="..\..\..\build\XamlSharedLinks.Build.props" />
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);AVALONIA_LVC;XAML_LVC</DefineConstants>

src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/PieChart.cs

@@ -25,10 +25,11 @@
 namespace LiveChartsCore.SkiaSharpView.Avalonia;
 
 // ==============================================================================
-// 
-// use the LiveChartsGeneratedCode.SourceGenPieChart class to add avalonia specific
-// code, this class is just to expose the PieChart class in this namespace.
-// 
+// this file exposes the control at this namespace.
+// to see the code expand this file in the solution explorer, it will include 3 files:
+//    - *.uiFramework.cs:   The UI framework specific code
+//    - *.shared.cs:        shared code between all UI frameworks
+//    - *.sgp.cs:           the source generated properties
 // ==============================================================================
 
 /// <inheritdoc cref="IPieChartView" />