diff --git a/LiveCharts.slnx b/LiveCharts.slnx index 13d141687..ea3f5994d 100644 --- a/LiveCharts.slnx +++ b/LiveCharts.slnx @@ -142,10 +142,13 @@ - - + + + + + diff --git a/build/NativeSharedLinks.Build.props b/build/NativeSharedLinks.Build.props new file mode 100644 index 000000000..035b31743 --- /dev/null +++ b/build/NativeSharedLinks.Build.props @@ -0,0 +1,7 @@ + + + + Native\%(RecursiveDir)%(Filename).cs + + + diff --git a/build/SharedLinks.Build.props b/build/SharedLinks.Build.props new file mode 100644 index 000000000..562ae3669 --- /dev/null +++ b/build/SharedLinks.Build.props @@ -0,0 +1,40 @@ + + + + %(Filename).cs + SourceGenChart.cs + + + + %(Filename).cs + CartesianChart.cs + + + CartesianChart.cs + + + + %(Filename).cs + PieChart.cs + + + PieChart.cs + + + + %(Filename).cs + PolarChart.cs + + + PolarChart.cs + + + + %(Filename).cs + GeoMap.cs + + + GeoMap.cs + + + diff --git a/build/WinUISharedLinks.Build.props b/build/WinUISharedLinks.Build.props new file mode 100644 index 000000000..151f313bc --- /dev/null +++ b/build/WinUISharedLinks.Build.props @@ -0,0 +1,24 @@ + + + + %(RecursiveDir)%(Filename).cs + + + + CartesianChart.cs + + + + PieChart.cs + + + + PolarChart.cs + + + + GeoMap.cs + + + + diff --git a/build/XamlSharedLinks.Build.props b/build/XamlSharedLinks.Build.props new file mode 100644 index 000000000..9d0b23e57 --- /dev/null +++ b/build/XamlSharedLinks.Build.props @@ -0,0 +1,7 @@ + + + + XamlFriendlySourceGenerated\%(Filename).cs + + + diff --git a/global.json b/global.json deleted file mode 100644 index 907a4317c..000000000 --- a/global.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "sdk": { - "version": "9.0.101", - "rollForward": "latestFeature" - }, - "msbuild-sdks": { - "Uno.Sdk": "6.2.36" - } -} diff --git a/samples/AvaloniaSample/AvaloniaSample.csproj b/samples/AvaloniaSample/AvaloniaSample.csproj index d706cf2a4..2b3d19ca9 100644 --- a/samples/AvaloniaSample/AvaloniaSample.csproj +++ b/samples/AvaloniaSample/AvaloniaSample.csproj @@ -3,7 +3,7 @@ - net8.0 + net10.0 enable $(GlobalLangVersion) true diff --git a/samples/AvaloniaSample/Platforms/AvaloniaSample.Android/AvaloniaSample.Android.csproj b/samples/AvaloniaSample/Platforms/AvaloniaSample.Android/AvaloniaSample.Android.csproj index 811245771..a833d3788 100644 --- a/samples/AvaloniaSample/Platforms/AvaloniaSample.Android/AvaloniaSample.Android.csproj +++ b/samples/AvaloniaSample/Platforms/AvaloniaSample.Android/AvaloniaSample.Android.csproj @@ -2,7 +2,7 @@ Exe - net8.0-android + net10.0-android 21 enable com.CompanyName.AvaloniaSample diff --git a/samples/AvaloniaSample/Platforms/AvaloniaSample.Android/Properties/launchSettings.json b/samples/AvaloniaSample/Platforms/AvaloniaSample.Android/Properties/launchSettings.json new file mode 100644 index 000000000..33504c948 --- /dev/null +++ b/samples/AvaloniaSample/Platforms/AvaloniaSample.Android/Properties/launchSettings.json @@ -0,0 +1,8 @@ +{ + "profiles": { + "WSL": { + "commandName": "WSL2", + "distributionName": "" + } + } +} \ No newline at end of file diff --git a/samples/AvaloniaSample/Platforms/AvaloniaSample.Browser/AvaloniaSample.Browser.csproj b/samples/AvaloniaSample/Platforms/AvaloniaSample.Browser/AvaloniaSample.Browser.csproj index 25fde94e7..81a3f8ad5 100644 --- a/samples/AvaloniaSample/Platforms/AvaloniaSample.Browser/AvaloniaSample.Browser.csproj +++ b/samples/AvaloniaSample/Platforms/AvaloniaSample.Browser/AvaloniaSample.Browser.csproj @@ -1,6 +1,6 @@  - net9.0-browser + net10.0-browser Exe true diff --git a/samples/AvaloniaSample/Platforms/AvaloniaSample.Desktop/AvaloniaSample.Desktop.csproj b/samples/AvaloniaSample/Platforms/AvaloniaSample.Desktop/AvaloniaSample.Desktop.csproj index 532652333..35e94a879 100644 --- a/samples/AvaloniaSample/Platforms/AvaloniaSample.Desktop/AvaloniaSample.Desktop.csproj +++ b/samples/AvaloniaSample/Platforms/AvaloniaSample.Desktop/AvaloniaSample.Desktop.csproj @@ -4,7 +4,7 @@ WinExe - net8.0 + net10.0 enable true app.manifest diff --git a/samples/AvaloniaSample/Platforms/AvaloniaSample.iOS/AvaloniaSample.iOS.csproj b/samples/AvaloniaSample/Platforms/AvaloniaSample.iOS/AvaloniaSample.iOS.csproj index d794b8344..0f1545bcf 100644 --- a/samples/AvaloniaSample/Platforms/AvaloniaSample.iOS/AvaloniaSample.iOS.csproj +++ b/samples/AvaloniaSample/Platforms/AvaloniaSample.iOS/AvaloniaSample.iOS.csproj @@ -1,7 +1,7 @@  Exe - net9.0-ios + net10.0-ios 13.0 enable diff --git a/samples/BlazorSample/BlazorSample.csproj b/samples/BlazorSample/BlazorSample.csproj index 6e6093dd2..6b323fcc6 100644 --- a/samples/BlazorSample/BlazorSample.csproj +++ b/samples/BlazorSample/BlazorSample.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable @@ -19,8 +19,8 @@ - - + + diff --git a/samples/EtoFormsSample/EtoFormsSample.csproj b/samples/EtoFormsSample/EtoFormsSample.csproj index ce4d04a59..4cdfb0c24 100644 --- a/samples/EtoFormsSample/EtoFormsSample.csproj +++ b/samples/EtoFormsSample/EtoFormsSample.csproj @@ -1,4 +1,4 @@ - + @@ -38,6 +38,8 @@ 10.0.17763.0 10.0.17763.0 6.5 + + @@ -59,9 +61,9 @@ - - - + + + diff --git a/samples/UnoPlatformSample/UnoPlatformSample/UnoPlatformSample.csproj b/samples/UnoPlatformSample/UnoPlatformSample/UnoPlatformSample.csproj index addcf1d01..cf48b1cc3 100644 --- a/samples/UnoPlatformSample/UnoPlatformSample/UnoPlatformSample.csproj +++ b/samples/UnoPlatformSample/UnoPlatformSample/UnoPlatformSample.csproj @@ -1,6 +1,6 @@ - + - net9.0-android;net9.0-ios;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop + net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop Exe true diff --git a/samples/VorticeSample/LiveChartsCore.Vortice/Hack.cs b/samples/VorticeSample/LiveChartsCore.Vortice/Hack.cs index e04fc030b..adac23e95 100644 --- a/samples/VorticeSample/LiveChartsCore.Vortice/Hack.cs +++ b/samples/VorticeSample/LiveChartsCore.Vortice/Hack.cs @@ -1,4 +1,5 @@ namespace LiveChartsCore.SkiaSharpView.TypeConverters; // hack ns to make source genetation happy. + internal class Hack { } diff --git a/samples/VorticeSample/LiveChartsCore.Vortice/LiveChartsCore.Vortice.csproj b/samples/VorticeSample/LiveChartsCore.Vortice/LiveChartsCore.Vortice.csproj index 326996417..3529ff489 100644 --- a/samples/VorticeSample/LiveChartsCore.Vortice/LiveChartsCore.Vortice.csproj +++ b/samples/VorticeSample/LiveChartsCore.Vortice/LiveChartsCore.Vortice.csproj @@ -2,7 +2,7 @@ $(GlobalLangVersion) - net9.0-windows + net10.0-windows enable enable @@ -17,4 +17,10 @@ + + + + + + diff --git a/samples/VorticeSample/VorticeSample/VorticeSample.csproj b/samples/VorticeSample/VorticeSample/VorticeSample.csproj index e1f457def..774e88b84 100644 --- a/samples/VorticeSample/VorticeSample/VorticeSample.csproj +++ b/samples/VorticeSample/VorticeSample/VorticeSample.csproj @@ -2,7 +2,7 @@ Exe - net9.0-windows + net10.0-windows enable enable true diff --git a/src/LiveChartsCore/LiveChartsCore.csproj b/src/LiveChartsCore/LiveChartsCore.csproj index 44d4243fa..2bc02fe97 100644 --- a/src/LiveChartsCore/LiveChartsCore.csproj +++ b/src/LiveChartsCore/LiveChartsCore.csproj @@ -7,7 +7,6 @@ net462; netstandard2.0; - netstandard2.1; net8.0; diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/AssemblyInfo.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/AssemblyInfo.cs deleted file mode 100644 index 74c554c92..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/AssemblyInfo.cs +++ /dev/null @@ -1,25 +0,0 @@ -// The MIT License(MIT) -// -// Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("LiveChartsCore.BackersPackage")] diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/CartesianChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/CartesianChart.cs index 351cf23b3..8321de8d8 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/CartesianChart.cs +++ b/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 // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/GeoMap.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/GeoMap.cs index 2fea3fb14..4e2d0125a 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/GeoMap.cs +++ b/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; diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsCore.SkiaSharpView.Avalonia.csproj b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsCore.SkiaSharpView.Avalonia.csproj index ef406bccd..95d5fb870 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsCore.SkiaSharpView.Avalonia.csproj +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsCore.SkiaSharpView.Avalonia.csproj @@ -1,10 +1,10 @@ - + Library $(GlobalLangVersion) enable - netstandard2.0;netstandard2.1;net6.0;net8.0; + netstandard2.0;net6.0;net8.0; LiveChartsCore.SkiaSharpView.Avalonia LiveChartsCore.SkiaSharpView.Avalonia @@ -28,8 +28,8 @@ embedded--> - - + + $(DefineConstants);AVALONIA_LVC;XAML_LVC diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/PieChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/PieChart.cs index 5b3af9483..baca22642 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/PieChart.cs +++ b/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 // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/PolarChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/PolarChart.cs index 31166ce91..3f4c981d8 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/PolarChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/PolarChart.cs @@ -25,10 +25,11 @@ namespace LiveChartsCore.SkiaSharpView.Avalonia; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenPolarChart class to add avalonia specific -// code, this class is just to expose the PolarChart 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 // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenCartesianChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenCartesianChart.avalonia.cs similarity index 90% rename from src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenCartesianChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenCartesianChart.avalonia.cs index 4fceb4095..ca76e03cb 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenCartesianChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenCartesianChart.avalonia.cs @@ -29,12 +29,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the Avalonia specific code for the SourceGenCartesianChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the Avalonia specific code +// =============================================== /// public partial class SourceGenCartesianChart : SourceGenChart, ICartesianChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenChart.cs similarity index 95% rename from src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenChart.cs index ac5324a04..8f824ca9b 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenChart.cs @@ -39,10 +39,11 @@ namespace LiveChartsGeneratedCode; // ============================================================================== -// -// this file contains the Avalonia specific code for the SourceGenChart class, -// the rest of the code can be found in the _Shared project. -// +// this file is the base class for this UI framework controls, in this file we +// define the UI framework specific code. +// expanding this file in the solution explorer will show 2 more files: +// - *.shared.cs: shared code between all UI frameworks +// - *.sgp.cs: the source generated properties // ============================================================================== /// @@ -178,9 +179,6 @@ private ISeries InflateSeriesTemplate(object item) return series; } - private static object GetSeriesSource(ISeries series) => - ((Control)series).DataContext!; - bool ICustomHitTest.HitTest(Point point) => new Rect(Bounds.Size).Contains(point); } diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenMapChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenMapChart.avalonia.cs similarity index 93% rename from src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenMapChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenMapChart.avalonia.cs index 1078bb850..6f222823c 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenMapChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenMapChart.avalonia.cs @@ -33,12 +33,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the Avalonia specific code for the SourceGenMapChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// ============================================================== +// this file contains the shared code between all UI frameworks +// ============================================================== /// public partial class SourceGenMapChart : UserControl, IGeoMapView, ICustomHitTest diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenPieChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenPieChart.avalonia.cs similarity index 88% rename from src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenPieChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenPieChart.avalonia.cs index c2608c398..e66cb959c 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenPieChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenPieChart.avalonia.cs @@ -24,12 +24,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the Avalonia specific code for the SourceGenPieChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// ============================================================== +// this file contains the shared code between all UI frameworks +// ============================================================== /// public partial class SourceGenPieChart : SourceGenChart, IPieChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenPolarChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenPolarChart.avalonia.cs similarity index 88% rename from src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenPolarChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenPolarChart.avalonia.cs index 18f918dec..ac4d85a8c 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsGeneratedCode/SourceGenPolarChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/SourceGenPolarChart.avalonia.cs @@ -24,12 +24,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the Avalonia specific code for the SourceGenPolarChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// ============================================================== +// this file contains the shared code between all UI frameworks +// ============================================================== /// public partial class SourceGenPolarChart : SourceGenChart, IPolarChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/CartesianChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/CartesianChart.cs index e9d269588..16afc76f7 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/CartesianChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/CartesianChart.cs @@ -25,10 +25,11 @@ namespace LiveChartsCore.SkiaSharpView.WPF; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenCartesianChart class to add wpf 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 // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/GeoMap.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/GeoMap.cs index be46f0159..10315292b 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/GeoMap.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/GeoMap.cs @@ -20,15 +20,16 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -using LiveChartsCore.Kernel.Sketches; +using LiveChartsCore.Geo; namespace LiveChartsCore.SkiaSharpView.WPF; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenMapChart class to add wpf 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 // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsCore.SkiaSharpView.WPF.csproj b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsCore.SkiaSharpView.WPF.csproj index 9eebd689a..289253f27 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsCore.SkiaSharpView.WPF.csproj +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsCore.SkiaSharpView.WPF.csproj @@ -29,8 +29,8 @@ true - - + + $(DefineConstants);WPF_LVC;XAML_LVC diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/PieChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/PieChart.cs index 454278067..295449879 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/PieChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/PieChart.cs @@ -25,10 +25,11 @@ namespace LiveChartsCore.SkiaSharpView.WPF; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenPieChart class to add wpf 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 // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/PolarChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/PolarChart.cs index ed3f2a2e2..0f79abd6f 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/PolarChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/PolarChart.cs @@ -25,10 +25,11 @@ namespace LiveChartsCore.SkiaSharpView.WPF; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenPolarChart class to add wpf specific -// code, this class is just to expose the PolarChart 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 // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenCartesianChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenCartesianChart.wpf.cs similarity index 86% rename from src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenCartesianChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenCartesianChart.wpf.cs index c8c343fc2..02036aba3 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenCartesianChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenCartesianChart.wpf.cs @@ -28,12 +28,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the WPF specific code for the SourceGenCartesianChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the WPF specific code +// =============================================== /// public partial class SourceGenCartesianChart : SourceGenChart, ICartesianChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenChart.cs similarity index 94% rename from src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenChart.cs index 8418ff4e7..543ddbf00 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenChart.cs @@ -36,10 +36,11 @@ namespace LiveChartsGeneratedCode; // ============================================================================== -// -// this file contains the WPF specific code for the SourceGenChart class, -// the rest of the code can be found in the _Shared project. -// +// this file is the base class for this UI framework controls, in this file we +// define the UI framework specific code. +// expanding this file in the solution explorer will show 2 more files: +// - *.shared.cs: shared code between all UI frameworks +// - *.sgp.cs: the source generated properties // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenMapChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenMapChart.wpf.cs similarity index 88% rename from src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenMapChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenMapChart.wpf.cs index 831a94900..16809b359 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenMapChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenMapChart.wpf.cs @@ -24,7 +24,6 @@ using System.ComponentModel; using System.Windows; using System.Windows.Controls; -using LiveChartsCore; using LiveChartsCore.Drawing; using LiveChartsCore.Geo; using LiveChartsCore.Kernel.Sketches; @@ -33,12 +32,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the WPF specific code for the SourceGenMapChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the WPF specific code +// =============================================== /// public abstract partial class SourceGenMapChart : UserControl, IGeoMapView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenPieChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenPieChart.wpf.cs similarity index 81% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenPieChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenPieChart.wpf.cs index 7b8757f54..57d3cb5e7 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenPieChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenPieChart.wpf.cs @@ -24,12 +24,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the Eto specific code for the SourceGenPieChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the WPF specific code +// =============================================== /// public partial class SourceGenPieChart : SourceGenChart, IPieChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenPolarChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenPolarChart.wpf.cs similarity index 81% rename from src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenPolarChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenPolarChart.wpf.cs index 2fae6c184..c63c737fa 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenPolarChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/SourceGenPolarChart.wpf.cs @@ -24,12 +24,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the WPF specific code for the SourceGenPolarChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the WPF specific code +// =============================================== /// public partial class SourceGenPolarChart : SourceGenChart, IPolarChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/AssemblyInfo.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/AssemblyInfo.cs deleted file mode 100644 index a21d8a792..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/AssemblyInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -// The MIT License(MIT) -// -// Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -#if !DEBUG && NET462 -using System.Reflection; -[assembly: AssemblyKeyFile("./../../../LiveCharts.snk")] -#else -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("LiveChartsCore.BackersPackage")] -#endif diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/CartesianChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/CartesianChart.cs index 9c4d8460f..94a2e4c82 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/CartesianChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/CartesianChart.cs @@ -25,12 +25,14 @@ namespace LiveChartsCore.SkiaSharpView.WinForms; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenCartesianChart class to add winforms 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 // ============================================================================== /// +[System.ComponentModel.DesignerCategory("")] public partial class CartesianChart : LiveChartsGeneratedCode.SourceGenCartesianChart { } diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/GeoMap.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/GeoMap.cs index 5bb28b447..59dd4e348 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/GeoMap.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/GeoMap.cs @@ -20,17 +20,19 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -using LiveChartsCore.Kernel.Sketches; +using LiveChartsCore.Geo; namespace LiveChartsCore.SkiaSharpView.WinForms; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenMapChart class to add winui/uno 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 // ============================================================================== /// +[System.ComponentModel.DesignerCategory("")] public sealed partial class GeoMap : LiveChartsGeneratedCode.SourceGenMapChart { } diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsCore.SkiaSharpView.WinForms.csproj b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsCore.SkiaSharpView.WinForms.csproj index 9f079c626..2acab2063 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsCore.SkiaSharpView.WinForms.csproj +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsCore.SkiaSharpView.WinForms.csproj @@ -32,7 +32,7 @@ true - + bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/MotionCanvas.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/MotionCanvas.cs index aea3f6a20..976072ed8 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/MotionCanvas.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/MotionCanvas.cs @@ -35,6 +35,7 @@ namespace LiveChartsCore.SkiaSharpView.WinForms; /// The motion canvas control for windows forms, . /// /// +[DesignerCategory("")] public partial class MotionCanvas : UserControl, IRenderMode { private IFrameTicker _ticker = null!; diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/PieChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/PieChart.cs index 1ab69a6e2..ef5bf317c 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/PieChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/PieChart.cs @@ -25,12 +25,14 @@ namespace LiveChartsCore.SkiaSharpView.WinForms; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenPieChart class to add winforms 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 // ============================================================================== /// +[System.ComponentModel.DesignerCategory("")] public partial class PieChart : LiveChartsGeneratedCode.SourceGenPieChart { } diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/PolarChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/PolarChart.cs index 6bc199098..063ebbd74 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/PolarChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/PolarChart.cs @@ -25,12 +25,14 @@ namespace LiveChartsCore.SkiaSharpView.WinForms; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenPolarChart class to add winforms specific -// code, this class is just to expose the PolarChart 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 // ============================================================================== /// +[System.ComponentModel.DesignerCategory("")] public partial class PolarChart : LiveChartsGeneratedCode.SourceGenPolarChart { } diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenCartesianChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenCartesianChart.winforms.cs similarity index 86% rename from src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenCartesianChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenCartesianChart.winforms.cs index 4b358c960..ee57bb8bb 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenCartesianChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenCartesianChart.winforms.cs @@ -28,12 +28,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the WinForms specific code for the SourceGenCartesianChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the Winforms specific code +// =============================================== /// public partial class SourceGenCartesianChart : SourceGenChart, ICartesianChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenCartesianChart.resx b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenCartesianChart.winforms.resx similarity index 100% rename from src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenCartesianChart.resx rename to src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenCartesianChart.winforms.resx diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenChart.cs similarity index 93% rename from src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenChart.cs index edb034874..fed52ab1d 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenChart.cs @@ -32,13 +32,15 @@ namespace LiveChartsGeneratedCode; // ============================================================================== -// -// this file contains the WinForms specific code for the SourceGenChart class, -// the rest of the code can be found in the _Shared project. -// +// this file is the base class for this UI framework controls, in this file we +// define the UI framework specific code. +// expanding this file in the solution explorer will show 2 more files: +// - *.shared.cs: shared code between all UI frameworks +// - *.sgp.cs: the source generated properties // ============================================================================== /// +[DesignerCategory("")] public abstract partial class SourceGenChart : UserControl, IChartView { /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenChart.resx b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenChart.resx similarity index 100% rename from src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenChart.resx rename to src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenChart.resx diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenMapChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenMapChart.winforms.cs similarity index 91% rename from src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenMapChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenMapChart.winforms.cs index 45a8cff9f..85f3cb92c 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenMapChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenMapChart.winforms.cs @@ -32,12 +32,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the WinForms specific code for the SourceGenMapChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the Winforms specific code +// =============================================== /// public abstract partial class SourceGenMapChart : UserControl, IGeoMapView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenMapChart.resx b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenMapChart.winforms.resx similarity index 100% rename from src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenMapChart.resx rename to src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenMapChart.winforms.resx diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenPieChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenPieChart.winforms.cs similarity index 81% rename from src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenPieChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenPieChart.winforms.cs index 56993e607..ce297f187 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsGeneratedCode/SourceGenPieChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenPieChart.winforms.cs @@ -24,12 +24,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the WPF specific code for the SourceGenPieChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the Winforms specific code +// =============================================== /// public partial class SourceGenPieChart : SourceGenChart, IPieChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenPolarChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenPolarChart.winforms.cs similarity index 81% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenPolarChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenPolarChart.winforms.cs index c726e91f6..5cce119aa 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenPolarChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenPolarChart.winforms.cs @@ -24,12 +24,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the Eto specific code for the SourceGenPolarChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the Winforms specific code +// =============================================== /// public partial class SourceGenPolarChart : SourceGenChart, IPolarChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenPolarChart.resx b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenPolarChart.winforms.resx similarity index 100% rename from src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenPolarChart.resx rename to src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/SourceGenPolarChart.winforms.resx diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp/LiveChartsCore.SkiaSharpView.csproj b/src/skiasharp/LiveChartsCore.SkiaSharp/LiveChartsCore.SkiaSharpView.csproj index e24957d2f..bd45ce012 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp/LiveChartsCore.SkiaSharpView.csproj +++ b/src/skiasharp/LiveChartsCore.SkiaSharp/LiveChartsCore.SkiaSharpView.csproj @@ -7,7 +7,6 @@ net462; netstandard2.0; - netstandard2.1; net8.0; diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/AssemblyInfo.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/AssemblyInfo.cs deleted file mode 100644 index 74c554c92..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/AssemblyInfo.cs +++ /dev/null @@ -1,25 +0,0 @@ -// The MIT License(MIT) -// -// Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("LiveChartsCore.BackersPackage")] diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/CartesianChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/CartesianChart.cs new file mode 100644 index 000000000..e9f665a35 --- /dev/null +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/CartesianChart.cs @@ -0,0 +1,38 @@ +// The MIT License(MIT) +// +// Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +using LiveChartsCore.Kernel.Sketches; +using LiveChartsGeneratedCode; + +namespace LiveChartsCore.SkiaSharpView.Blazor; + +// ============================================================================== +// 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 +// ============================================================================== + +/// +public partial class CartesianChart : SourceGenCartesianChart, ICartesianChartView +{ } diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/CartesianChart.razor b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/CartesianChart.razor deleted file mode 100644 index c118f7234..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/CartesianChart.razor +++ /dev/null @@ -1,38 +0,0 @@ -@* - The MIT License(MIT) - - Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*@ - -@inherits LiveChartsGeneratedCode.SourceGenCartesianChart - -@* -============================================================================== - -use the LiveChartsGeneratedCode.SourceGenCartesianChart class to add blazor specific -code, this class is just to expose the CartesianChart class in this namespace. - -============================================================================== -*@ - -@{ - base.BuildRenderTree(__builder); -} diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/GeoMap.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/GeoMap.cs new file mode 100644 index 000000000..d99c789c8 --- /dev/null +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/GeoMap.cs @@ -0,0 +1,38 @@ +// The MIT License(MIT) +// +// Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +using LiveChartsCore.Geo; +using LiveChartsGeneratedCode; + +namespace LiveChartsCore.SkiaSharpView.Blazor; + +// ============================================================================== +// 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 +// ============================================================================== + +/// +public partial class GeoMap : SourceGenMapChart +{ } diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/GeoMap.razor b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/GeoMap.razor deleted file mode 100644 index 191f55845..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/GeoMap.razor +++ /dev/null @@ -1,39 +0,0 @@ -@* - The MIT License(MIT) - - Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*@ - -@inherits LiveChartsGeneratedCode.SourceGenMapChart - -@* -============================================================================== - -use the LiveChartsGeneratedCode.SourceGenMapChart class to add blazor specific -code, this class is just to expose the MapChart class in this namespace. - -============================================================================== -*@ - -@{ - base.BuildRenderTree(__builder); -} - diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenCartesianChart.razor b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenCartesianChart.razor deleted file mode 100644 index 1df571998..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenCartesianChart.razor +++ /dev/null @@ -1,31 +0,0 @@ -@* - The MIT License(MIT) - - Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*@ - -@namespace LiveChartsGeneratedCode - -@inherits SourceGenChart - -@{ - base.BuildRenderTree(__builder); -} diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenChart.razor b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenChart.razor deleted file mode 100644 index fb1b821ba..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenChart.razor +++ /dev/null @@ -1,36 +0,0 @@ -@* - The MIT License(MIT) - - Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*@ - -@using LiveChartsCore.SkiaSharpView.Blazor - -@namespace LiveChartsGeneratedCode - - - diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenMapChart.razor b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenMapChart.razor deleted file mode 100644 index 048195b9a..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenMapChart.razor +++ /dev/null @@ -1,31 +0,0 @@ -@* - The MIT License(MIT) - - Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*@ - -@using LiveChartsCore.SkiaSharpView.Blazor - -@namespace LiveChartsGeneratedCode - - - diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenPieChart.razor b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenPieChart.razor deleted file mode 100644 index 1df571998..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenPieChart.razor +++ /dev/null @@ -1,31 +0,0 @@ -@* - The MIT License(MIT) - - Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*@ - -@namespace LiveChartsGeneratedCode - -@inherits SourceGenChart - -@{ - base.BuildRenderTree(__builder); -} diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenPolarChart.razor b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenPolarChart.razor deleted file mode 100644 index 1df571998..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenPolarChart.razor +++ /dev/null @@ -1,31 +0,0 @@ -@* - The MIT License(MIT) - - Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*@ - -@namespace LiveChartsGeneratedCode - -@inherits SourceGenChart - -@{ - base.BuildRenderTree(__builder); -} diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveChartsCore.SkiaSharpView.Blazor.csproj b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveChartsCore.SkiaSharpView.Blazor.csproj index 6f0374a35..5403f3432 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveChartsCore.SkiaSharpView.Blazor.csproj +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveChartsCore.SkiaSharpView.Blazor.csproj @@ -27,7 +27,7 @@ true - + $(DefineConstants);BLAZOR_LVC @@ -74,4 +74,5 @@ + diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/PieChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/PieChart.cs new file mode 100644 index 000000000..909cb09f0 --- /dev/null +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/PieChart.cs @@ -0,0 +1,39 @@ +// The MIT License(MIT) +// +// Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +using LiveChartsCore.Kernel.Sketches; +using LiveChartsGeneratedCode; + +namespace LiveChartsCore.SkiaSharpView.Blazor; + +// ============================================================================== +// 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 +// ============================================================================== + +/// +public partial class PieChart : SourceGenPieChart +{ } + diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/PieChart.razor b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/PieChart.razor deleted file mode 100644 index 7559fca9a..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/PieChart.razor +++ /dev/null @@ -1,38 +0,0 @@ -@* - The MIT License(MIT) - - Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*@ - -@inherits LiveChartsGeneratedCode.SourceGenPieChart - -@* -============================================================================== - -use the LiveChartsGeneratedCode.SourceGenPieChart class to add blazor specific -code, this class is just to expose the PieChart class in this namespace. - -============================================================================== -*@ - -@{ - base.BuildRenderTree(__builder); -} diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/PolarChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/PolarChart.cs new file mode 100644 index 000000000..213d873eb --- /dev/null +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/PolarChart.cs @@ -0,0 +1,39 @@ +// The MIT License(MIT) +// +// Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +using LiveChartsCore.Kernel.Sketches; +using LiveChartsGeneratedCode; + +namespace LiveChartsCore.SkiaSharpView.Blazor; + +// ============================================================================== +// 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 +// ============================================================================== + +/// +public partial class PolarChart : SourceGenPolarChart +{ } + diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/PolarChart.razor b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/PolarChart.razor deleted file mode 100644 index fca54952c..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/PolarChart.razor +++ /dev/null @@ -1,38 +0,0 @@ -@* - The MIT License(MIT) - - Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*@ - -@inherits LiveChartsGeneratedCode.SourceGenPolarChart - -@* -============================================================================== - -use the LiveChartsGeneratedCode.SourceGenPolarChart class to add blazor specific -code, this class is just to expose the PolarChart class in this namespace. - -============================================================================== -*@ - -@{ - base.BuildRenderTree(__builder); -} diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenCartesianChart.razor.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenCartesianChart.blazor.cs similarity index 82% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenCartesianChart.razor.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenCartesianChart.blazor.cs index c99785668..5b4c9768b 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenCartesianChart.razor.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenCartesianChart.blazor.cs @@ -24,20 +24,24 @@ using LiveChartsCore.Drawing; using LiveChartsCore.Kernel.Sketches; using LiveChartsCore.Measure; +using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.Components.Web; namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the Blazor specific code for the CartesianChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the Blazor specific code +// =============================================== /// public partial class SourceGenCartesianChart : SourceGenChart, ICartesianChartView { + /// + /// Builds the render tree. + /// + protected override void BuildRenderTree(RenderTreeBuilder builder) => + base.BuildRenderTree(builder); + /// protected override void OnWheel(WheelEventArgs e) { diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenChart.razor.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenChart.cs similarity index 77% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenChart.razor.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenChart.cs index bfddd1a50..f0d14ef96 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenChart.razor.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenChart.cs @@ -25,19 +25,21 @@ using LiveChartsCore.Motion; using LiveChartsCore.SkiaSharpView.Blazor; using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.Components.Web; namespace LiveChartsGeneratedCode; // ============================================================================== -// -// this file contains the Blazor specific code for the ChartControl class, -// the rest of the code can be found in the _Shared project. -// +// this file is the base class for this UI framework controls, in this file we +// define the UI framework specific code. +// expanding this file in the solution explorer will show 2 more files: +// - *.shared.cs: shared code between all UI frameworks +// - *.sgp.cs: the source generated properties // ============================================================================== /// -public abstract partial class SourceGenChart : IDisposable, IChartView +public abstract partial class SourceGenChart : ComponentBase, IDisposable, IChartView { #pragma warning disable IDE0032 // Use auto property, blazor ref private MotionCanvas _motionCanvas = null!; @@ -58,6 +60,22 @@ protected SourceGenChart() /// public CoreMotionCanvas CoreCanvas => _motionCanvas.CanvasCore; + /// + /// Builds the render tree. + /// + protected override void BuildRenderTree(RenderTreeBuilder builder) + { + base.BuildRenderTree(builder); + builder.OpenComponent(0); + builder.AddAttribute(1, "OnPointerDownCallback", EventCallback.Factory.Create(this, OnPointerDown)); + builder.AddAttribute(2, "OnPointerMoveCallback", EventCallback.Factory.Create(this, OnPointerMove)); + builder.AddAttribute(3, "OnPointerUpCallback", EventCallback.Factory.Create(this, OnPointerUp)); + builder.AddAttribute(4, "OnPointerOutCallback", EventCallback.Factory.Create(this, OnPointerOut)); + builder.AddAttribute(5, "OnWheelCallback", EventCallback.Factory.Create(this, OnWheel)); + builder.AddComponentReferenceCapture(7, r => _motionCanvas = (MotionCanvas)r); + builder.CloseComponent(); + } + /// protected override void OnAfterRender(bool firstRender) { diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenMapChart.razor.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenMapChart.blazor.cs similarity index 79% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenMapChart.razor.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenMapChart.blazor.cs index 1e0160f1e..3dc3acc34 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenMapChart.razor.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenMapChart.blazor.cs @@ -25,18 +25,17 @@ using LiveChartsCore.Kernel.Sketches; using LiveChartsCore.Motion; using LiveChartsCore.SkiaSharpView.Blazor; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Rendering; namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the Blazor specific code for the SourceGenMapChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the Blazor specific code +// =============================================== /// -public abstract partial class SourceGenMapChart : IDisposable, IGeoMapView +public abstract partial class SourceGenMapChart : ComponentBase, IDisposable, IGeoMapView { #pragma warning disable IDE0032 // Use auto property, blazor ref private MotionCanvas _motionCanvas = null!; @@ -61,6 +60,16 @@ protected SourceGenMapChart() Height = _motionCanvas.Height }; + /// + /// Builds the render tree. + /// + protected override void BuildRenderTree(RenderTreeBuilder builder) + { + builder.OpenComponent(0); + builder.AddComponentReferenceCapture(1, r => _motionCanvas = (MotionCanvas)r); + builder.CloseComponent(); + } + /// protected override void OnAfterRender(bool firstRender) { diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenPieChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenPieChart.blazor.cs similarity index 78% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenPieChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenPieChart.blazor.cs index b50e1d0de..761366a51 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenPieChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenPieChart.blazor.cs @@ -21,16 +21,20 @@ // SOFTWARE. using LiveChartsCore.Kernel.Sketches; +using Microsoft.AspNetCore.Components.Rendering; namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the MAUI specific code for the SourceGenPieChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the Blazor specific code +// =============================================== /// public partial class SourceGenPieChart : SourceGenChart, IPieChartView -{ } +{ + /// + /// Builds the render tree. + /// + protected override void BuildRenderTree(RenderTreeBuilder builder) => + base.BuildRenderTree(builder); +} diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenPolarChart.razor.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenPolarChart.blazor.cs similarity index 78% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenPolarChart.razor.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenPolarChart.blazor.cs index b55f99152..030832c4f 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenPolarChart.razor.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/SourceGenPolarChart.blazor.cs @@ -21,16 +21,20 @@ // SOFTWARE. using LiveChartsCore.Kernel.Sketches; +using Microsoft.AspNetCore.Components.Rendering; namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the Blazor specific code for the PolarChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the Blazor specific code +// =============================================== /// public partial class SourceGenPolarChart : SourceGenChart, IPolarChartView -{ } +{ + /// + /// Builds the render tree. + /// + protected override void BuildRenderTree(RenderTreeBuilder builder) => + base.BuildRenderTree(builder); +} diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/AssemblyInfo.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/AssemblyInfo.cs deleted file mode 100644 index 74c554c92..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/AssemblyInfo.cs +++ /dev/null @@ -1,25 +0,0 @@ -// The MIT License(MIT) -// -// Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("LiveChartsCore.BackersPackage")] diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/CartesianChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/CartesianChart.cs index ce2815d32..91f7be668 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/CartesianChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/CartesianChart.cs @@ -25,10 +25,11 @@ namespace LiveChartsCore.SkiaSharpView.Eto; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenCartesianChart class to add eto 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 // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/GeoMap.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/GeoMap.cs index a75ac0a0f..a4909b644 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/GeoMap.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/GeoMap.cs @@ -23,10 +23,11 @@ using LiveChartsCore.Geo; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenMapChart class to add eto 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.Eto; diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsCore.SkiaSharpView.Eto.csproj b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsCore.SkiaSharpView.Eto.csproj index a5ff4f487..e5474ba05 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsCore.SkiaSharpView.Eto.csproj +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsCore.SkiaSharpView.Eto.csproj @@ -4,7 +4,7 @@ Library $(GlobalLangVersion) enable - netstandard2.0;netstandard2.1; + netstandard2.0; LiveChartsCore.SkiaSharpView.Eto LiveChartsCore.SkiaSharpView.Eto $(LiveChartsVersion) @@ -24,7 +24,7 @@ true - + true diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/PieChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/PieChart.cs index 6f02682c9..15b60eb6c 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/PieChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/PieChart.cs @@ -25,10 +25,11 @@ namespace LiveChartsCore.SkiaSharpView.Eto; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenPieChart class to add eto 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 // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/PolarChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/PolarChart.cs index 274d8d511..c27c3203d 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/PolarChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/PolarChart.cs @@ -25,10 +25,11 @@ namespace LiveChartsCore.SkiaSharpView.Eto; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenPolarChart class to add eto specific -// code, this class is just to expose the PolarChart 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 // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenCartesianChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenCartesianChart.eto.cs similarity index 86% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenCartesianChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenCartesianChart.eto.cs index 406623b95..6e1a14f57 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenCartesianChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenCartesianChart.eto.cs @@ -28,12 +28,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the ETO specific code for the SourceGenCartesianChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the Eto specific code +// =============================================== /// public partial class SourceGenCartesianChart : SourceGenChart, ICartesianChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenChart.cs similarity index 92% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenChart.cs index a0e6f1590..686a0c1f7 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenChart.cs @@ -31,10 +31,11 @@ namespace LiveChartsGeneratedCode; // ============================================================================== -// -// this file contains the Eto specific code for the SourceGenChart class, -// the rest of the code can be found in the _Shared project. -// +// this file is the base class for this UI framework controls, in this file we +// define the UI framework specific code. +// expanding this file in the solution explorer will show 2 more files: +// - *.shared.cs: shared code between all UI frameworks +// - *.sgp.cs: the source generated properties // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenMapChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenMapChart.eto.cs similarity index 88% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenMapChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenMapChart.eto.cs index e5bdce3c7..2b68f9c2b 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsGeneratedCode/SourceGenMapChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenMapChart.eto.cs @@ -31,12 +31,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the Eto specific code for the SourceGenMapChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the Eto specific code +// =============================================== /// public abstract partial class SourceGenMapChart : Panel, IGeoMapView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenPieChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenPieChart.eto.cs similarity index 81% rename from src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenPieChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenPieChart.eto.cs index dc864a362..a343c50a2 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenPieChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenPieChart.eto.cs @@ -24,12 +24,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the WinForms specific code for the SourceGenPieChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the Eto specific code +// =============================================== /// public partial class SourceGenPieChart : SourceGenChart, IPieChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenPolarChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenPolarChart.eto.cs similarity index 81% rename from src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenPolarChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenPolarChart.eto.cs index 9178c17ec..6574e7795 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsGeneratedCode/SourceGenPolarChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/SourceGenPolarChart.eto.cs @@ -24,12 +24,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the WinForms specific code for the SourceGenPolarChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the Eto specific code +// =============================================== /// public partial class SourceGenPolarChart : SourceGenChart, IPolarChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/AssemblyInfo.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/AssemblyInfo.cs deleted file mode 100644 index 74c554c92..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/AssemblyInfo.cs +++ /dev/null @@ -1,25 +0,0 @@ -// The MIT License(MIT) -// -// Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("LiveChartsCore.BackersPackage")] diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/CartesianChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/CartesianChart.cs index c5af93463..98d3cd954 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/CartesianChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/CartesianChart.cs @@ -25,10 +25,11 @@ namespace LiveChartsCore.SkiaSharpView.Maui; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenCartesianChart class to add maui 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 // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/GeoMap.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/GeoMap.cs index 9c995968a..6d77a7206 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/GeoMap.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/GeoMap.cs @@ -23,10 +23,11 @@ using LiveChartsCore.Geo; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenMapChart class to add MAUI 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.Maui; diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.csproj b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.csproj index 501e8d825..596aaa277 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.csproj +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.csproj @@ -7,11 +7,13 @@ true - net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst; + net9.0;net9.0-android;net9.0-ios;net9.0-maccatalyst; + net10.0;net10.0-android;net10.0-ios;net10.0-maccatalyst; $(TargetFrameworks); - net8.0-windows10.0.19041.0 + net9.0-windows10.0.19041.0; + net10.0-windows10.0.19041.0; 11.0 @@ -21,8 +23,6 @@ 10.0.17763.0 6.5 - win-x86;win-x64;win-arm64 - $(LiveChartsVersion) icon.png Simple, flexible, interactive and powerful data visualization for Maui. @@ -42,19 +42,42 @@ true - - - + + + $(NoWarn);NETSDK1206 + + + + + $(DefineConstants);MAUI_LVC;XAML_LVC + + + + 9.0.120 + + + 10.0.0 + + + - + + + + + diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PieChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PieChart.cs index 804fdd288..231fe703c 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PieChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PieChart.cs @@ -25,10 +25,11 @@ namespace LiveChartsCore.SkiaSharpView.Maui; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenPieChart class to add maui 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 // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PolarChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PolarChart.cs index 2e6830e84..7e0c27bf8 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PolarChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PolarChart.cs @@ -25,10 +25,11 @@ namespace LiveChartsCore.SkiaSharpView.Maui; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenPolarChart class to add maui specific -// code, this class is just to expose the PolarChart 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 // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenCartesianChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenCartesianChart.maui.cs similarity index 87% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenCartesianChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenCartesianChart.maui.cs index dfd1d194c..f26ea94de 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenCartesianChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenCartesianChart.maui.cs @@ -27,12 +27,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the MAUI specific code for the SourceGenCartesianChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the MAUI specific code +// =============================================== /// public partial class SourceGenCartesianChart : SourceGenChart, ICartesianChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenChart.cs similarity index 94% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenChart.cs index fa6b87690..ae91de9f2 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenChart.cs @@ -33,10 +33,11 @@ namespace LiveChartsGeneratedCode; // ============================================================================== -// -// this file contains the MAUI specific code for the SourceGenChart class, -// the rest of the code can be found in the _Shared project. -// +// this file is the base class for this UI framework controls, in this file we +// define the UI framework specific code. +// expanding this file in the solution explorer will show 2 more files: +// - *.shared.cs: shared code between all UI frameworks +// - *.sgp.cs: the source generated properties // ============================================================================== /// diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenMapChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenMapChart.maui.cs similarity index 88% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenMapChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenMapChart.maui.cs index 9353ecb5b..d4241fae4 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenMapChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenMapChart.maui.cs @@ -30,12 +30,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the MAUI specific code for the SourceGenMapChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the MAUI specific code +// =============================================== /// public abstract partial class SourceGenMapChart : ChartView, IGeoMapView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenPieChart.razor.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenPieChart.maui.cs similarity index 81% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenPieChart.razor.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenPieChart.maui.cs index 905002901..d3f561907 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveCharetsGeneratedCode/SourceGenPieChart.razor.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenPieChart.maui.cs @@ -24,12 +24,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the Blazor specific code for the PieChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the MAUI specific code +// =============================================== /// public partial class SourceGenPieChart : SourceGenChart, IPieChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenPolarChart.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenPolarChart.maui.cs similarity index 81% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenPolarChart.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenPolarChart.maui.cs index af26e16a6..b6f4adf65 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsGeneratedCode/SourceGenPolarChart.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/SourceGenPolarChart.maui.cs @@ -24,12 +24,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the MAUI specific code for the SourceGenPolarChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the MAUI specific code +// =============================================== /// public partial class SourceGenPolarChart : SourceGenChart, IPolarChartView diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/AssemblyInfo.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/AssemblyInfo.cs deleted file mode 100644 index 74c554c92..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/AssemblyInfo.cs +++ /dev/null @@ -1,25 +0,0 @@ -// The MIT License(MIT) -// -// Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("LiveChartsCore.BackersPackage")] diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj index 4422fc387..13102664d 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj @@ -1,4 +1,4 @@ - + enable $(GlobalLangVersion) @@ -8,14 +8,14 @@ $(LatestSkiaSharpVersion) - net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst; - net9.0;net9.0-android;net9.0-ios;net9.0-browserwasm;net9.0-desktop + net9.0;net9.0-android;net9.0-ios;net9.0-browserwasm;net9.0-desktop; + net10.0;net10.0-android;net10.0-ios;net10.0-browserwasm;net10.0-desktop $(TargetFrameworks); - net8.0-windows10.0.19041.0; - net9.0-windows10.0.26100.0; + net9.0-windows10.0.19041.0; + net10.0-windows10.0.19041.0; true @@ -51,10 +51,10 @@ - - - - + + + + $(DefineConstants);UNO_LVC;WINUI_LVC;XAML_LVC diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/SkiaRenderer/SkiaRenderMode.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/Rendering/SkiaRenderMode.cs similarity index 98% rename from src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/SkiaRenderer/SkiaRenderMode.cs rename to src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/Rendering/SkiaRenderMode.cs index 01ee3c901..1c6d4712d 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/SkiaRenderer/SkiaRenderMode.cs +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/Rendering/SkiaRenderMode.cs @@ -34,7 +34,7 @@ using Uno.WinUI.Graphics2DSK; using Windows.Foundation; -namespace LiveChartsCore.SkiaSharpView.WinUI.SkiaRenderer; +namespace LiveChartsCore.SkiaSharpView.WinUI.Rendering; internal partial class SkiaRenderMode : Grid, IRenderMode { diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/readme.txt b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/readme.txt deleted file mode 100644 index ff1a68d48..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/readme.txt +++ /dev/null @@ -1,3 +0,0 @@ - -Most of the code is at the _Shared.WinUI project. -because the code is shared between WinUI and Uno diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/AssemblyInfo.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/AssemblyInfo.cs deleted file mode 100644 index 74c554c92..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/AssemblyInfo.cs +++ /dev/null @@ -1,25 +0,0 @@ -// The MIT License(MIT) -// -// Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("LiveChartsCore.BackersPackage")] diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.csproj b/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.csproj index 0dcb13a6f..aed36417b 100644 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.csproj +++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.csproj @@ -34,10 +34,10 @@ true - - - - + + + + $(DefineConstants);WINUI_LVC;XAML_LVC diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/readme.txt b/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/readme.txt deleted file mode 100644 index ff1a68d48..000000000 --- a/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/readme.txt +++ /dev/null @@ -1,3 +0,0 @@ - -Most of the code is at the _Shared.WinUI project. -because the code is shared between WinUI and Uno diff --git a/src/skiasharp/_Shared.WinUI/CartesianChart.cs b/src/skiasharp/_Shared.WinUI/CartesianChart.cs index 7e61bff9c..fc7380c08 100644 --- a/src/skiasharp/_Shared.WinUI/CartesianChart.cs +++ b/src/skiasharp/_Shared.WinUI/CartesianChart.cs @@ -25,10 +25,11 @@ namespace LiveChartsCore.SkiaSharpView.WinUI; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenCartesianChart class to add winui/uno 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 // ============================================================================== /// diff --git a/src/skiasharp/_Shared.WinUI/GeoMap.cs b/src/skiasharp/_Shared.WinUI/GeoMap.cs index efb6e3486..c704cbd85 100644 --- a/src/skiasharp/_Shared.WinUI/GeoMap.cs +++ b/src/skiasharp/_Shared.WinUI/GeoMap.cs @@ -20,15 +20,16 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -using LiveChartsCore.Kernel.Sketches; +using LiveChartsCore.Geo; namespace LiveChartsCore.SkiaSharpView.WinUI; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenMapChart class to add winui/uno 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 // ============================================================================== /// diff --git a/src/skiasharp/_Shared.WinUI/MotionCanvas.cs b/src/skiasharp/_Shared.WinUI/MotionCanvas.cs index b65fbca8e..d0a1211e0 100644 --- a/src/skiasharp/_Shared.WinUI/MotionCanvas.cs +++ b/src/skiasharp/_Shared.WinUI/MotionCanvas.cs @@ -24,12 +24,7 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using LiveChartsCore.Native; - -#if !HAS_OS_LVC -using LiveChartsCore.SkiaSharpView.WinUI.SkiaRenderer; -#else using LiveChartsCore.SkiaSharpView.WinUI.Rendering; -#endif #pragma warning disable IDE0028 // Simplify collection initialization diff --git a/src/skiasharp/_Shared.WinUI/PieChart.cs b/src/skiasharp/_Shared.WinUI/PieChart.cs index a61131a92..c59b76169 100644 --- a/src/skiasharp/_Shared.WinUI/PieChart.cs +++ b/src/skiasharp/_Shared.WinUI/PieChart.cs @@ -25,10 +25,11 @@ namespace LiveChartsCore.SkiaSharpView.WinUI; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenPieChart class to add winui/uno 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 // ============================================================================== /// diff --git a/src/skiasharp/_Shared.WinUI/PolarChart.cs b/src/skiasharp/_Shared.WinUI/PolarChart.cs index b5ab3bbc2..b5ce8fb1f 100644 --- a/src/skiasharp/_Shared.WinUI/PolarChart.cs +++ b/src/skiasharp/_Shared.WinUI/PolarChart.cs @@ -25,10 +25,11 @@ namespace LiveChartsCore.SkiaSharpView.WinUI; // ============================================================================== -// -// use the LiveChartsGeneratedCode.SourceGenPolarChart class to add winui/uno specific -// code, this class is just to expose the PolarChart 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 // ============================================================================== /// diff --git a/src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenCartesianChart.cs b/src/skiasharp/_Shared.WinUI/SourceGenCartesianChart.winui.cs similarity index 87% rename from src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenCartesianChart.cs rename to src/skiasharp/_Shared.WinUI/SourceGenCartesianChart.winui.cs index a268709ec..6b63633ba 100644 --- a/src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenCartesianChart.cs +++ b/src/skiasharp/_Shared.WinUI/SourceGenCartesianChart.winui.cs @@ -28,12 +28,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the WinUI/UNO specific code for the SourceGenCartesianChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the WinUI/Uno specific code +// =============================================== /// public partial class SourceGenCartesianChart : SourceGenChart, ICartesianChartView diff --git a/src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenChart.cs b/src/skiasharp/_Shared.WinUI/SourceGenChart.cs similarity index 95% rename from src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenChart.cs rename to src/skiasharp/_Shared.WinUI/SourceGenChart.cs index 9f806f65a..85cdc4c1e 100644 --- a/src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenChart.cs +++ b/src/skiasharp/_Shared.WinUI/SourceGenChart.cs @@ -36,10 +36,11 @@ namespace LiveChartsGeneratedCode; // ============================================================================== -// -// this file contains the WinUI/UNO specific code for the SourceGenChart class, -// the rest of the code can be found in the _Shared project. -// +// this file is the base class for this UI framework controls, in this file we +// define the UI framework specific code. +// expanding this file in the solution explorer will show 2 more files: +// - *.shared.cs: shared code between all UI frameworks +// - *.sgp.cs: the source generated properties // ============================================================================== /// diff --git a/src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenMapChart.cs b/src/skiasharp/_Shared.WinUI/SourceGenMapChart.winui.cs similarity index 89% rename from src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenMapChart.cs rename to src/skiasharp/_Shared.WinUI/SourceGenMapChart.winui.cs index e51c5e7b7..7317c1572 100644 --- a/src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenMapChart.cs +++ b/src/skiasharp/_Shared.WinUI/SourceGenMapChart.winui.cs @@ -32,12 +32,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the WinUI/UNO specific code for the SourceGenMapChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the WinUI/Uno specific code +// =============================================== /// public abstract partial class SourceGenMapChart : UserControl, IGeoMapView diff --git a/src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenPieChart.cs b/src/skiasharp/_Shared.WinUI/SourceGenPieChart.winui.cs similarity index 81% rename from src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenPieChart.cs rename to src/skiasharp/_Shared.WinUI/SourceGenPieChart.winui.cs index dc0bf9e1b..e3e9212b5 100644 --- a/src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenPieChart.cs +++ b/src/skiasharp/_Shared.WinUI/SourceGenPieChart.winui.cs @@ -24,12 +24,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the WinUI/UNO specific code for the SourceGenPieChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the WinUI/Uno specific code +// =============================================== /// public partial class SourceGenPieChart : SourceGenChart, IPieChartView diff --git a/src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenPolarChart.cs b/src/skiasharp/_Shared.WinUI/SourceGenPolarChart.winui.cs similarity index 81% rename from src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenPolarChart.cs rename to src/skiasharp/_Shared.WinUI/SourceGenPolarChart.winui.cs index 9905999a5..bda351d7e 100644 --- a/src/skiasharp/_Shared.WinUI/LiveChartsGeneratedCode/SourceGenPolarChart.cs +++ b/src/skiasharp/_Shared.WinUI/SourceGenPolarChart.winui.cs @@ -24,12 +24,9 @@ namespace LiveChartsGeneratedCode; -// ============================================================================== -// -// this file contains the WinUI/UNO specific code for the SourceGenPolarChart class, -// the rest of the code can be found in the _Shared project. -// -// ============================================================================== +// =============================================== +// this file contains the WinUI/Uno specific code +// =============================================== /// public partial class SourceGenPolarChart : SourceGenChart, IPolarChartView diff --git a/src/skiasharp/_Shared.WinUI/_Shared.WinUI.projitems b/src/skiasharp/_Shared.WinUI/_Shared.WinUI.projitems index 8e7910781..4a225d1c5 100644 --- a/src/skiasharp/_Shared.WinUI/_Shared.WinUI.projitems +++ b/src/skiasharp/_Shared.WinUI/_Shared.WinUI.projitems @@ -11,16 +11,16 @@ - - - - - + + + + + diff --git a/src/skiasharp/_Shared/SourceGenCartesianChart.cs b/src/skiasharp/_Shared/SourceGenCartesianChart.shared.cs similarity index 95% rename from src/skiasharp/_Shared/SourceGenCartesianChart.cs rename to src/skiasharp/_Shared/SourceGenCartesianChart.shared.cs index e3d9bc5ee..11e7686b0 100644 --- a/src/skiasharp/_Shared/SourceGenCartesianChart.cs +++ b/src/skiasharp/_Shared/SourceGenCartesianChart.shared.cs @@ -35,6 +35,10 @@ namespace LiveChartsGeneratedCode; +// ============================================================== +// this file contains the shared code between all UI frameworks +// ============================================================== + /// #if SKIA_IMAGE_LVC public partial class SourceGenSKCartesianChart : SGChart, ICartesianChartView diff --git a/src/skiasharp/_Shared/SourceGenChartControl.sgp.cs b/src/skiasharp/_Shared/SourceGenChart.sgp.cs similarity index 100% rename from src/skiasharp/_Shared/SourceGenChartControl.sgp.cs rename to src/skiasharp/_Shared/SourceGenChart.sgp.cs diff --git a/src/skiasharp/_Shared/SourceGenChartControl.cs b/src/skiasharp/_Shared/SourceGenChart.shared.cs similarity index 97% rename from src/skiasharp/_Shared/SourceGenChartControl.cs rename to src/skiasharp/_Shared/SourceGenChart.shared.cs index 323b41eee..7d2f8df28 100644 --- a/src/skiasharp/_Shared/SourceGenChartControl.cs +++ b/src/skiasharp/_Shared/SourceGenChart.shared.cs @@ -38,6 +38,10 @@ namespace LiveChartsGeneratedCode; +// ============================================================== +// this file contains the shared code between all UI frameworks +// ============================================================== + /// #if SKIA_IMAGE_LVC public partial class SourceGenSKChart : IChartView diff --git a/src/skiasharp/_Shared/SourceGenMapChart.cs b/src/skiasharp/_Shared/SourceGenMapChart.shared.cs similarity index 91% rename from src/skiasharp/_Shared/SourceGenMapChart.cs rename to src/skiasharp/_Shared/SourceGenMapChart.shared.cs index ec0454c4f..f1c902b41 100644 --- a/src/skiasharp/_Shared/SourceGenMapChart.cs +++ b/src/skiasharp/_Shared/SourceGenMapChart.shared.cs @@ -26,6 +26,10 @@ namespace LiveChartsGeneratedCode; +// ============================================================== +// this file contains the shared code between all UI frameworks +// ============================================================== + /// #if SKIA_IMAGE_LVC public partial class SourceGenSKMapChart : IGeoMapView diff --git a/src/skiasharp/_Shared/SourceGenPieChart.cs b/src/skiasharp/_Shared/SourceGenPieChart.shared.cs similarity index 91% rename from src/skiasharp/_Shared/SourceGenPieChart.cs rename to src/skiasharp/_Shared/SourceGenPieChart.shared.cs index e1424966c..646c18486 100644 --- a/src/skiasharp/_Shared/SourceGenPieChart.cs +++ b/src/skiasharp/_Shared/SourceGenPieChart.shared.cs @@ -33,6 +33,10 @@ namespace LiveChartsGeneratedCode; +// ============================================================== +// this file contains the shared code between all UI frameworks +// ============================================================== + /// #if SKIA_IMAGE_LVC public partial class SourceGenSKPieChart : SGChart, IPieChartView diff --git a/src/skiasharp/_Shared/SourceGenPolarChart.cs b/src/skiasharp/_Shared/SourceGenPolarChart.shared.cs similarity index 94% rename from src/skiasharp/_Shared/SourceGenPolarChart.cs rename to src/skiasharp/_Shared/SourceGenPolarChart.shared.cs index 1f83576e4..c07318745 100644 --- a/src/skiasharp/_Shared/SourceGenPolarChart.cs +++ b/src/skiasharp/_Shared/SourceGenPolarChart.shared.cs @@ -35,6 +35,10 @@ namespace LiveChartsGeneratedCode; +// ============================================================== +// this file contains the shared code between all UI frameworks +// ============================================================== + /// #if SKIA_IMAGE_LVC public partial class SourceGenSKPolarChart : SGChart, IPolarChartView diff --git a/src/skiasharp/_Shared/_Shared.projitems b/src/skiasharp/_Shared/_Shared.projitems index cb8ecdb34..e1f24ec65 100644 --- a/src/skiasharp/_Shared/_Shared.projitems +++ b/src/skiasharp/_Shared/_Shared.projitems @@ -6,15 +6,15 @@ 2ad18dd8-c567-4bcf-a4fa-42519466d6a3 - + - - - + + + - + - + \ No newline at end of file