Rendering improvements

Directory.Build.props

@@ -7,8 +7,34 @@
     <GlobalLangVersion>preview</GlobalLangVersion>
 
     <MauiVersion>8.0.82</MauiVersion>
-    <SkiaSharpVersion>2.88.9</SkiaSharpVersion>
+    <MinSkiaSharpVersion>2.88.9</MinSkiaSharpVersion>
     <LatestSkiaSharpVersion>3.119.0</LatestSkiaSharpVersion> <!-- used for views that use the SkiaSharp 3 as default -->
 
   </PropertyGroup>
+
+  <!--
+  used to test the library on multiple render modes,
+  the IsPacking check ensures that this config is not used in the NuGet packages.
+  -->
+  <PropertyGroup Condition="'$(IsPacking)' != 'true'">
+    <GPU>true</GPU>
+    <VSYNC>true</VSYNC>
+    <FPS>30</FPS>
+    <Diagnose>true</Diagnose>
+    <UsesUnoSkiaRenderer>true</UsesUnoSkiaRenderer>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="
+    '$(TargetFramework)' != ''                      and
+    (
+      $(TargetFramework.Contains('-windows'))       or
+      $(TargetFramework.Contains('-android'))       or
+      $(TargetFramework.Contains('-ios'))           or
+      $(TargetFramework.Contains('-maccatalyst'))   or
+      $(TargetFramework.Contains('-desktop'))       or
+      $(TargetFramework.Contains('-browserwasm'))
+    )">
+    <DefineConstants>$(DefineConstants);HAS_UI_LVC</DefineConstants>
+  </PropertyGroup>
+
 </Project>

LiveCharts.Maui.slnx

@@ -6,10 +6,10 @@
     <Project Path="samples/ViewModelsSamples/ViewModelsSamples.csproj" />
   </Folder>
   <Project Path="generators/LiveChartsGenerators/LiveChartsGenerators.csproj" />
-  <Project Path="src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.csproj" />
   <Project Path="src/LiveChartsCore/LiveChartsCore.csproj" />
   <Project Path="src/skiasharp/LiveChartsCore.SkiaSharp/LiveChartsCore.SkiaSharpView.csproj" />
   <Project Path="src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.csproj" />
   <Project Path="src/skiasharp/_Shared.Xaml/_Shared.Xaml.shproj" Id="8f2bb38b-163c-43af-9dee-6f5438ba87b0" />
   <Project Path="src/skiasharp/_Shared/_Shared.shproj" Id="2ad18dd8-c567-4bcf-a4fa-42519466d6a3" />
+<Project Path="src/_Shared.Native/_Shared.Native.shproj" Id="ebf70b6d-1416-4cc6-a540-f4ebf2371819" />
 </Solution>

LiveCharts.Uno.slnx

@@ -1,9 +1,16 @@
 <Solution>
+  <Folder Name="/Sample/">
+    <Project Path="samples/UnoPlatformSample/UnoPlatformSample/UnoPlatformSample.csproj">
+      <Deploy Solution="Debug|*" />
+    </Project>
+    <Project Path="samples/ViewModelsSamples/ViewModelsSamples.csproj" />
+  </Folder>
   <Project Path="generators/LiveChartsGenerators/LiveChartsGenerators.csproj" />
   <Project Path="src/LiveChartsCore/LiveChartsCore.csproj" />
   <Project Path="src/skiasharp/LiveChartsCore.SkiaSharp/LiveChartsCore.SkiaSharpView.csproj" />
   <Project Path="src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj" />
   <Project Path="src/skiasharp/_Shared.WinUI/_Shared.WinUI.shproj" Id="e98bb79a-300e-4556-ac59-47a9aaf1d5f1" />
   <Project Path="src/skiasharp/_Shared.Xaml/_Shared.Xaml.shproj" Id="8f2bb38b-163c-43af-9dee-6f5438ba87b0" />
   <Project Path="src/skiasharp/_Shared/_Shared.shproj" Id="2ad18dd8-c567-4bcf-a4fa-42519466d6a3" />
+  <Project Path="src/_Shared.Native/_Shared.Native.shproj" Id="ebf70b6d-1416-4cc6-a540-f4ebf2371819" />
 </Solution>

LiveCharts.WinUI.slnx

@@ -13,4 +13,5 @@
   <Project Path="src/skiasharp/_Shared.WinUI/_Shared.WinUI.shproj" Id="e98bb79a-300e-4556-ac59-47a9aaf1d5f1" />
   <Project Path="src/skiasharp/_Shared.Xaml/_Shared.Xaml.shproj" Id="8f2bb38b-163c-43af-9dee-6f5438ba87b0" />
   <Project Path="src/skiasharp/_Shared/_Shared.shproj" Id="2ad18dd8-c567-4bcf-a4fa-42519466d6a3" />
+  <Project Path="src/_Shared.Native/_Shared.Native.shproj" Id="ebf70b6d-1416-4cc6-a540-f4ebf2371819" />
 </Solution>

LiveCharts.slnx

@@ -79,7 +79,12 @@
     </Project>
   </Folder>
   <Folder Name="/Samples/UnoPlatform/">
-    <File Path="readme.txt" />
+    <Project Path="samples/UnoPlatformSample/UnoPlatformSample/UnoPlatformSample.csproj">
+      <BuildType Solution="Ad-Hoc|*" Project="Release" />
+      <BuildType Solution="AppStore|*" Project="Release" />
+      <Deploy Solution="Debug|Any CPU" />
+      <Deploy Solution="Release|Any CPU" />
+    </Project>
   </Folder>
   <Folder Name="/Samples/WinForms/">
     <Project Path="samples/WinFormsSample/WinFormsSample.csproj">
@@ -112,16 +117,16 @@
     <File Path="Directory.Build.props" />
     <File Path="global.json" />
   </Folder>
+  <Folder Name="/Solution Items/RenderingSettings/">
+    <File Path="build/RenderSettings.Build.props" />
+    <File Path="build/RenderSettings.Uno.Build.props" />
+  </Folder>
   <Folder Name="/Tests/">
     <Project Path="tests/LiveChartsCore.UnitTesting/LiveChartsCore.UnitTesting.csproj">
       <BuildType Solution="Ad-Hoc|*" Project="Release" />
       <BuildType Solution="AppStore|*" Project="Release" />
     </Project>
   </Folder>
-  <Project Path="src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.csproj">
-    <BuildType Solution="Ad-Hoc|*" Project="Debug" />
-    <BuildType Solution="AppStore|*" Project="Debug" />
-  </Project>
   <Project Path="src/LiveChartsCore/LiveChartsCore.csproj">
     <BuildType Solution="Ad-Hoc|*" Project="Release" />
     <BuildType Solution="AppStore|*" Project="Release" />
@@ -165,4 +170,5 @@
   <Project Path="src/skiasharp/_Shared.WinUI/_Shared.WinUI.shproj" Id="e98bb79a-300e-4556-ac59-47a9aaf1d5f1" />
   <Project Path="src/skiasharp/_Shared.Xaml/_Shared.Xaml.shproj" />
   <Project Path="src/skiasharp/_Shared/_Shared.shproj" />
+  <Project Path="src/_Shared.Native/_Shared.Native.shproj" Id="ebf70b6d-1416-4cc6-a540-f4ebf2371819" />
 </Solution>

build/RenderSettings.Build.props

@@ -0,0 +1,53 @@
+<Project>
+
+  <PropertyGroup Condition="'$(GPU)' == 'true'">
+    <DefineConstants>$(DefineConstants);__GPU_TRUE__</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(GPU)' == 'false'">
+    <DefineConstants>$(DefineConstants);__GPU_FALSE__</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(VSYNC)' == 'true'">
+    <DefineConstants>$(DefineConstants);__VSYNC_TRUE__</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(VSYNC)' == 'false'">
+    <DefineConstants>$(DefineConstants);__VSYNC_FALSE__</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Diagnose)' == 'true'">
+    <DefineConstants>$(DefineConstants);__DIAGNOSE__</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(FPS)' == '10'">
+    <DefineConstants>$(DefineConstants);__FPS_10__</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(FPS)' == '20'">
+    <DefineConstants>$(DefineConstants);__FPS_20__</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(FPS)' == '30'">
+    <DefineConstants>$(DefineConstants);__FPS_30__</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(FPS)' == '45'">
+    <DefineConstants>$(DefineConstants);__FPS_45__</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(FPS)' == '60'">
+    <DefineConstants>$(DefineConstants);__FPS_60__</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(FPS)' == '75'">
+    <DefineConstants>$(DefineConstants);__FPS_75__</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(FPS)' == '90'">
+    <DefineConstants>$(DefineConstants);__FPS_90__</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(FPS)' == '120'">
+    <DefineConstants>$(DefineConstants);__FPS_120__</DefineConstants>
+  </PropertyGroup>
+
+</Project>

build/RenderSettings.Uno.Build.props

@@ -0,0 +1,12 @@
+<Project>
+
+  <PropertyGroup Condition="'$(UsesUnoSkiaRenderer)' == 'true'">
+    <UnoFeatures>$(UnoFeatures);SkiaRenderer</UnoFeatures>
+    <DefineConstants>$(DefineConstants);__USES_UNO_RENDERER__</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(UsesUnoSkiaRenderer)' == 'false'">
+    <DefineConstants>$(DefineConstants);__NO_USES_UNO_RENDERER__</DefineConstants>
+  </PropertyGroup>
+
+</Project>

build/pack.ps1

@@ -47,7 +47,7 @@ foreach ($p in $projects) {
         Remove-Item $($folder + "/bin") -Force -Recurse
     }
 
-    $expression = "dotnet pack $($p.src) -o $nupkgOutputPath -c $configuration -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg"
+    $expression = "dotnet pack $($p.src) -o $nupkgOutputPath -c $configuration -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg -p:IsPacking=true"
 
     Write-Progress -Activity "$name" -Status "Packing..."
     $result = Invoke-Expression $expression

generators/LiveChartsGenerators/LiveChartsGenerators.csproj

@@ -5,11 +5,29 @@
     <LangVersion>$(GlobalLangVersion)</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
+
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <CompilerGeneratedFilesOutputPath>Generated</CompilerGeneratedFilesOutputPath>
     <IsRoslynComponent>true</IsRoslynComponent>
+
+    <PackageType>Analyzer</PackageType>
+    <IncludeBuildOutput>true</IncludeBuildOutput>
+    <IncludeAnalyzer>true</IncludeAnalyzer>
+    <Version>1.0.0</Version>
+    <Description>LiveCharts code generation.</Description>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <Authors>$(LiveChartsAuthors)</Authors>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+    <RepositoryUrl>https://github.com/beto-rodriguez/LiveCharts2</RepositoryUrl>
+
+    <Deterministic>true</Deterministic>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
   <ItemGroup>

global.json

@@ -1,6 +1,9 @@
 {
-  "sdk": {
-    "version": "9.0.101",
-    "rollForward": "latestFeature"
-  }
-}
+    "sdk": {
+        "version": "9.0.101",
+        "rollForward": "latestFeature"
+    },
+    "msbuild-sdks": {
+        "Uno.Sdk": "6.1.23"
+    }
+}

readme.txt

@@ -1 +1 @@
-For Uno, open ./samples/UnoPlatform_v5/UnoPlatform.slnx
+For Uno, open ./samples/UnoPlatform/UnoPlatform.slnx

samples/MauiSample/MauiSample.csproj

@@ -3,8 +3,8 @@
 	<PropertyGroup>
     <Nullable>enable</Nullable>
     <LangVersion>$(GlobalLangVersion)</LangVersion>
-    <TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.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> -->
 
@@ -32,8 +32,8 @@
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.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>

samples/UnoPlatformSample/UnoPlatformSample.slnx

@@ -1,13 +1,13 @@
 <Solution>
   <Folder Name="/LiveChartsSource/">
     <Project Path="../../generators/LiveChartsGenerators/LiveChartsGenerators.csproj" />
-    <Project Path="../../src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.csproj" />
     <Project Path="../../src/LiveChartsCore/LiveChartsCore.csproj" />
     <Project Path="../../src/skiasharp/LiveChartsCore.SkiaSharp/LiveChartsCore.SkiaSharpView.csproj" />
     <Project Path="../../src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj" />
     <Project Path="../../src/skiasharp/_Shared.WinUI/_Shared.WinUI.shproj" Id="e98bb79a-300e-4556-ac59-47a9aaf1d5f1" />
     <Project Path="../../src/skiasharp/_Shared.Xaml/_Shared.Xaml.shproj" Id="8f2bb38b-163c-43af-9dee-6f5438ba87b0" />
     <Project Path="../../src/skiasharp/_Shared/_Shared.shproj" Id="2ad18dd8-c567-4bcf-a4fa-42519466d6a3" />
+    <Project Path="../../src/_Shared.Native/_Shared.Native.shproj" Id="ebf70b6d-1416-4cc6-a540-f4ebf2371819" />
     <Project Path="../ViewModelsSamples/ViewModelsSamples.csproj" />
   </Folder>
   <Folder Name="/Solution Items/">

samples/UnoPlatformSample/UnoPlatformSample/Properties/launchSettings.json

@@ -27,6 +27,15 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
+    // Note: In order to select this profile, you'll need to comment the `Packaged` profile below until this is fixed: https://aka.platform.uno/wasdk-maui-debug-profile-issue
+    "UnoApp1 (WinAppSDK Unpackaged)": {
+      "commandName": "Project",
+      "compatibleTargetFramework": "windows"
+    },
+    "UnoApp1 (WinAppSDK Packaged)": {
+      "commandName": "MsixPackage",
+      "compatibleTargetFramework": "windows"
+    },
     "UnoPlatformSample (Desktop)": {
       "commandName": "Project",
       "compatibleTargetFramework": "desktop"

samples/UnoPlatformSample/UnoPlatformSample/Styles/ColorPaletteOverride.xaml

@@ -1,8 +1,9 @@
-<!-- This file is generated by a tool from the file ColorPaletteOverride.zip - - YOU SHOULD NOT EDIT IT manually.-->
+<!-- This file is generated by a tool from the file ColorPaletteOverride.json - - YOU SHOULD NOT EDIT IT manually.-->
 <ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
   <ResourceDictionary.ThemeDictionaries>
     <ResourceDictionary x:Key="Light">
       <Color x:Key="PrimaryColor">#5946D2</Color>
+      <Color x:Key="SurfaceTintColor">#5946D2</Color>
       <Color x:Key="OnPrimaryColor">#FFFFFF</Color>
       <Color x:Key="PrimaryContainerColor">#E5DEFF</Color>
       <Color x:Key="OnPrimaryContainerColor">#170065</Color>
@@ -15,8 +16,8 @@
       <Color x:Key="TertiaryContainerColor">#CFE4FF</Color>
       <Color x:Key="OnTertiaryContainerColor">#001D36</Color>
       <Color x:Key="ErrorColor">#B3261E</Color>
-      <Color x:Key="ErrorContainerColor">#F9DEDC</Color>
       <Color x:Key="OnErrorColor">#FFFFFF</Color>
+      <Color x:Key="ErrorContainerColor">#F9DEDC</Color>
       <Color x:Key="OnErrorContainerColor">#410E0B</Color>
       <Color x:Key="BackgroundColor">#FCFBFF</Color>
       <Color x:Key="OnBackgroundColor">#1C1B1F</Color>
@@ -25,14 +26,14 @@
       <Color x:Key="SurfaceVariantColor">#F2EFF5</Color>
       <Color x:Key="OnSurfaceVariantColor">#8B8494</Color>
       <Color x:Key="OutlineColor">#79747E</Color>
-      <Color x:Key="OnSurfaceInverseColor">#F4EFF4</Color>
-      <Color x:Key="SurfaceInverseColor">#313033</Color>
-      <Color x:Key="PrimaryInverseColor">#C8BFFF</Color>
-      <Color x:Key="SurfaceTintColor">#5946D2</Color>
       <Color x:Key="OutlineVariantColor">#C9C5D0</Color>
+      <Color x:Key="SurfaceInverseColor">#E6E1E5</Color>
+      <Color x:Key="OnsurfaceInverseColor">#1C1B1F</Color>
+      <Color x:Key="PrimaryInverseColor">#2A009F</Color>
     </ResourceDictionary>
     <ResourceDictionary x:Key="Dark">
       <Color x:Key="PrimaryColor">#C7BFFF</Color>
+      <Color x:Key="SurfaceTintColor">#C7BFFF</Color>
       <Color x:Key="OnPrimaryColor">#2A009F</Color>
       <Color x:Key="PrimaryContainerColor">#4129BA</Color>
       <Color x:Key="OnPrimaryContainerColor">#E4DFFF</Color>
@@ -45,8 +46,8 @@
       <Color x:Key="TertiaryContainerColor">#00497D</Color>
       <Color x:Key="OnTertiaryContainerColor">#D1E4FF</Color>
       <Color x:Key="ErrorColor">#FFB4AB</Color>
-      <Color x:Key="ErrorContainerColor">#93000A</Color>
       <Color x:Key="OnErrorColor">#690005</Color>
+      <Color x:Key="ErrorContainerColor">#93000A</Color>
       <Color x:Key="OnErrorContainerColor">#FFDAD6</Color>
       <Color x:Key="BackgroundColor">#1C1B1F</Color>
       <Color x:Key="OnBackgroundColor">#E5E1E6</Color>
@@ -55,11 +56,10 @@
       <Color x:Key="SurfaceVariantColor">#47464F</Color>
       <Color x:Key="OnSurfaceVariantColor">#C9C5D0</Color>
       <Color x:Key="OutlineColor">#928F99</Color>
-      <Color x:Key="OnSurfaceInverseColor">#1C1B1F</Color>
+      <Color x:Key="OutlineVariantColor">#57545D</Color>
       <Color x:Key="SurfaceInverseColor">#E6E1E5</Color>
+      <Color x:Key="OnsurfaceInverseColor">#1C1B1F</Color>
       <Color x:Key="PrimaryInverseColor">#2A009F</Color>
-      <Color x:Key="SurfaceTintColor">#C7BFFF</Color>
-      <Color x:Key="OutlineVariantColor">#57545D</Color>
     </ResourceDictionary>
   </ResourceDictionary.ThemeDictionaries>
-</ResourceDictionary>
+</ResourceDictionary>