Uno packing

Directory.Build.props

@@ -27,6 +27,12 @@
     -->
     <HarfBuzzWASMVersion>8.3.1.1</HarfBuzzWASMVersion>
 
+    <!--
+    Useful to toggle between using project references or nuget references
+    -->
+    <UseNuGetForSamples>true</UseNuGetForSamples>
+    <UseNuGetForGenerator>false</UseNuGetForGenerator>
+
   </PropertyGroup>
 
   <!--
@@ -38,7 +44,6 @@
     <VSYNC>true</VSYNC>
     <FPS>30</FPS>
     <Diagnose>false</Diagnose>
-    <UsesUnoSkiaRenderer>true</UsesUnoSkiaRenderer>
   </PropertyGroup>
 
   <PropertyGroup Condition="
@@ -48,10 +53,10 @@
       $(TargetFramework.Contains('-android'))       or
       $(TargetFramework.Contains('-ios'))           or
       $(TargetFramework.Contains('-maccatalyst'))   or
-      $(TargetFramework.Contains('-desktop'))       or
-      $(TargetFramework.Contains('-browserwasm'))
+      $(TargetFramework.Contains('-tizen'))
     )">
-    <DefineConstants>$(DefineConstants);HAS_UI_LVC</DefineConstants>
+    <DefineConstants>$(DefineConstants);HAS_OS_LVC</DefineConstants>
+    <HasOS>true</HasOS>
   </PropertyGroup>
 
 </Project>

LiveCharts.slnx

@@ -146,7 +146,6 @@
   </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">

build/pack.ps1

@@ -2,7 +2,6 @@ param([string]$configuration = "Debug", [string]$nupkgOutputPath = "./nupkg")
 
 [Project[]]$projects = @(
     [Project]::new("./src/LiveChartsCore/LiveChartsCore.csproj")
-    [Project]::new("./src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.csproj")
     [Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharp/LiveChartsCore.SkiaSharpView.csproj")
     [Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsCore.SkiaSharpView.Avalonia.csproj")
     [Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsCore.SkiaSharpView.WinForms.csproj")

samples/AvaloniaSample/AvaloniaSample.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="../../Directory.Build.props"/>
+  <Import Project="../../Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -29,7 +29,15 @@
    </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\skiasharp\LiveChartsCore.SkiaSharp.Avalonia\LiveChartsCore.SkiaSharpView.Avalonia.csproj" />
     <ProjectReference Include="..\ViewModelsSamples\ViewModelsSamples.csproj" />
   </ItemGroup>
+
+  <ItemGroup Condition="$(UseNuGetForSamples)">
+    <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="$(LiveChartsVersion)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!$(UseNuGetForSamples)">
+    <ProjectReference Include="..\..\src\skiasharp\LiveChartsCore.SkiaSharp.Avalonia\LiveChartsCore.SkiaSharpView.Avalonia.csproj" />
+  </ItemGroup>
+
 </Project>

samples/BlazorSample/BlazorSample.csproj

@@ -24,9 +24,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\skiasharp\LiveChartsCore.SkiaSharpView.Blazor\LiveChartsCore.SkiaSharpView.Blazor.csproj" />
     <ProjectReference Include="..\ViewModelsSamples\ViewModelsSamples.csproj" />
-    <ProjectReference Include="..\..\generators\LiveChartsGenerators\LiveChartsGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(UseNuGetForSamples)">
+    <PackageReference Include="LiveChartsCore.SkiaSharpView.Blazor" Version="$(LiveChartsVersion)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!$(UseNuGetForSamples)">
+    <ProjectReference Include="..\..\src\skiasharp\LiveChartsCore.SkiaSharpView.Blazor\LiveChartsCore.SkiaSharpView.Blazor.csproj" />
   </ItemGroup>
 
 </Project>

samples/EtoFormsSample/EtoFormsSample.csproj

@@ -25,13 +25,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\skiasharp\LiveChartsCore.SkiaSharpView.Eto\LiveChartsCore.SkiaSharpView.Eto.csproj" />
     <ProjectReference Include="..\ViewModelsSamples\ViewModelsSamples.csproj" />
-    <ProjectReference Include="..\..\generators\LiveChartsGenerators\LiveChartsGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="Images\livecharts.png" />
   </ItemGroup>
 
+  <ItemGroup Condition="$(UseNuGetForSamples)">
+    <PackageReference Include="LiveChartsCore.SkiaSharpView.Eto" Version="$(LiveChartsVersion)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!$(UseNuGetForSamples)">
+    <ProjectReference Include="..\..\src\skiasharp\LiveChartsCore.SkiaSharpView.Eto\LiveChartsCore.SkiaSharpView.Eto.csproj" />
+  </ItemGroup>
+
 </Project>

samples/MauiSample/MauiSample.csproj

@@ -58,11 +58,18 @@
   </ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\src\skiasharp\LiveChartsCore.SkiaSharpView.Maui\LiveChartsCore.SkiaSharpView.Maui.csproj" />
 	  <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" />
 	</ItemGroup>
 
+  <ItemGroup Condition="$(UseNuGetForSamples)">
+    <PackageReference Include="LiveChartsCore.SkiaSharpView.Maui" Version="$(LiveChartsVersion)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!$(UseNuGetForSamples)">
+    <ProjectReference Include="..\..\src\skiasharp\LiveChartsCore.SkiaSharpView.Maui\LiveChartsCore.SkiaSharpView.Maui.csproj" />
+  </ItemGroup>
+
 </Project>

samples/UnoPlatformSample/Directory.Packages.props

@@ -6,5 +6,6 @@
     See https://aka.platform.uno/using-uno-sdk#implicit-packages for more information regarding the Implicit Packages.
   -->
   <ItemGroup>
+      <PackageVersion Include="LiveChartsCore.SkiaSharpView.Uno.WinUI" Version="$(LiveChartsVersion)" />
   </ItemGroup>
 </Project>

samples/UnoPlatformSample/UnoPlatformSample/UnoPlatformSample.csproj

@@ -35,19 +35,14 @@
             Localization;
             Navigation;
             ThemeService;
+            SkiaRenderer;
         </UnoFeatures>
 
-        <!--
-          TO ENABLE SKIARENDERER, USE THE DIRECTORY.BUILD.PROPERTIES IN THE
-          ROOT OF THE REPO.
-        -->
-
     </PropertyGroup>
 
     <Import Project="./../Directory.Build.props"/>
     <Import Project="./../../../Directory.Build.props"/>
     <Import Project="./../../../build/RenderSettings.Build.props"/>
-    <Import Project="./../../../build/RenderSettings.Uno.Build.props"/>
 
     <ItemGroup>
         <Page Include="..\..\WinUISample\WinUISample\Samples\**\*.xaml">
@@ -60,8 +55,15 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\skiasharp\LiveChartsCore.SkiaSharpView.Uno.WinUI\LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj" />
         <ProjectReference Include="..\..\ViewModelsSamples\ViewModelsSamples.csproj" />
     </ItemGroup>
 
+    <ItemGroup Condition="$(UseNuGetForSamples)">
+        <PackageReference Include="LiveChartsCore.SkiaSharpView.Uno.WinUI" />
+    </ItemGroup>
+
+    <ItemGroup Condition="!$(UseNuGetForSamples)">
+        <ProjectReference Include="..\..\..\src\skiasharp\LiveChartsCore.SkiaSharpView.Uno.WinUI\LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj" />
+    </ItemGroup>
+
 </Project>

samples/WPFSample/WPFSample.csproj

@@ -14,10 +14,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\skiasharp\LiveChartsCore.SkiaSharp.WPF\LiveChartsCore.SkiaSharpView.WPF.csproj" />
     <ProjectReference Include="..\ViewModelsSamples\ViewModelsSamples.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="$(UseNuGetForSamples)">
+    <PackageReference Include="LiveChartsCore.SkiaSharpView.WPF" Version="$(LiveChartsVersion)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!$(UseNuGetForSamples)">
+    <ProjectReference Include="..\..\src\skiasharp\LiveChartsCore.SkiaSharp.WPF\LiveChartsCore.SkiaSharpView.WPF.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <Resource Include="Images\livecharts.png" />
   </ItemGroup>

samples/WinFormsSample/WinFormsSample.csproj

@@ -9,9 +9,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\skiasharp\LiveChartsCore.SkiaSharp.WinForms\LiveChartsCore.SkiaSharpView.WinForms.csproj" />
     <ProjectReference Include="..\ViewModelsSamples\ViewModelsSamples.csproj" />
-    <ProjectReference Include="..\..\generators\LiveChartsGenerators\LiveChartsGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(UseNuGetForSamples)">
+    <PackageReference Include="LiveChartsCore.SkiaSharpView.WinForms" Version="$(LiveChartsVersion)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!$(UseNuGetForSamples)">
+    <ProjectReference Include="..\..\src\skiasharp\LiveChartsCore.SkiaSharp.WinForms\LiveChartsCore.SkiaSharpView.WinForms.csproj" />
   </ItemGroup>
 
 </Project>

samples/WinUISample/WinUISample/WinUISample.csproj

@@ -46,8 +46,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\skiasharp\LiveChartsCore.SkiaSharpView.WinUI\LiveChartsCore.SkiaSharpView.WinUI.csproj" />
     <ProjectReference Include="..\..\ViewModelsSamples\ViewModelsSamples.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="$(UseNuGetForSamples)">
+    <PackageReference Include="LiveChartsCore.SkiaSharpView.WinUI" Version="$(LiveChartsVersion)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!$(UseNuGetForSamples)">
+    <ProjectReference Include="..\..\..\src\skiasharp\LiveChartsCore.SkiaSharpView.WinUI\LiveChartsCore.SkiaSharpView.WinUI.csproj" />
+  </ItemGroup>
+
 </Project>

src/LiveChartsCore/LiveChartsCore.csproj

@@ -71,11 +71,18 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="$(UseNuGetForGenerator)">
     <PackageReference Include="LiveChartsGenerators" Version="$(LiveChartsCodeGenVersion)">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup Condition="!$(UseNuGetForGenerator)">
+    <ProjectReference Include="..\..\generators\LiveChartsGenerators\LiveChartsGenerators.csproj" >
+      <OutputItemType>Analyzer</OutputItemType>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+
 </Project>

src/_Shared.Native/Platforms/Android/NativeTicker.cs

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#if ANDROID && !__UNO_SKIA__
+#if ANDROID
 
 // reachable on maui android or uno android (without skia renderer)
 

src/_Shared.Native/Platforms/Android/PointerController.cs

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#if ANDROID && !__UNO_SKIA__
+#if ANDROID
 
 // reachable on maui android or uno android (without skia renderer)
 

src/_Shared.Native/Platforms/Mac/NativeTicker.cs

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#if (IOS || MACCATALYST) && !__UNO_SKIA__
+#if IOS || MACCATALYST
 
 // reachable on maui ios/catalys or uno ios/catalyst (without skia renderer)
 

src/_Shared.Native/Platforms/Mac/PointerController.cs

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#if (MACCATALYST || IOS) && !__UNO_SKIA__
+#if MACCATALYST || IOS
 
 // reachable on maui ios/catalys or uno ios/catalyst (without skia renderer)
 

src/_Shared.Native/Platforms/NoUI/NativeTicker.cs → src/_Shared.Native/Platforms/NoOS/NativeTicker.cs

@@ -20,11 +20,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#if !HAS_UI_LVC
+#if !HAS_OS_LVC && !UNO_LVC
 
 // This code is reached maybe only on test environments.
-// HAS_UI is true when the target framework contains any of the following:
-// -windows, -android, -ios, -maccatalyst, -tizen, -desktop, -browserwasm
+// HAS_OS_LVC is true when the target framework contains any of the following:
+// -windows, -android, -ios, -maccatalyst, -tizen
 
 using LiveChartsCore.Motion;
 

src/_Shared.Native/Platforms/NoUI/PointerController.cs → src/_Shared.Native/Platforms/NoOS/PointerController.cs

@@ -20,11 +20,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#if !HAS_UI_LVC
+#if !HAS_OS_LVC && !UNO_LVC
 
 // This code is reached maybe only on test environments.
-// HAS_UI is true when the target framework contains any of the following:
-// -windows, -android, -ios, -maccatalyst, -tizen, -desktop, -browserwasm
+// HAS_OS_LVC is true when the target framework contains any of the following:
+// -windows, -android, -ios, -maccatalyst, -tizen
 
 namespace LiveChartsCore.Native;