diff --git a/.github/workflows/Nightly.yml b/.github/workflows/Nightly.yml
index 5f900eac0..ed681a0aa 100644
--- a/.github/workflows/Nightly.yml
+++ b/.github/workflows/Nightly.yml
@@ -78,5 +78,5 @@ jobs:
# "dotnet nuget push" with "dotnet nuget add source" to GitHub Packages is unstable for project names with a dot: https://github.com/NuGet/Home/issues/9775#issuecomment-714509211
# So we must specify api-key directly in "dotnet nuget push" instead of following the GitHub Packages documentation
# --no-symbols true to not let GitHub Releases interpret .snupkg as .nupkg
- dotnet nuget push .nupkgs\*.nupkg --source 'https://nuget.pkg.github.com/verybadcat/index.json' --api-key ${{ github.token }} --skip-duplicate --no-symbols true
+ dotnet nuget push '.nupkgs\*.nupkg' --source 'https://nuget.pkg.github.com/verybadcat/index.json' --api-key ${{ github.token }} --skip-duplicate --no-symbols true
shell: pwsh
\ No newline at end of file
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
index 89cdb3594..d65f9c25c 100644
--- a/.github/workflows/Release.yml
+++ b/.github/workflows/Release.yml
@@ -40,5 +40,5 @@ jobs:
- name: Upload to NuGet
run: |
# Use --skip-duplicate since we want re-runs of this workflow to succeed in case of network issues
- dotnet nuget push .nupkgs\*.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate
+ dotnet nuget push '.nupkgs\*.nupkg' -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate
shell: pwsh
diff --git a/.gitignore b/.gitignore
index 8544c14b2..59e9fdc85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
## START Specifically added for CSharpMath
-# Special one for XamarinAndroidTemp on Mac
-C:/
-
# For CSharpMath.Rendering.Tests
CSharpMath.Rendering.Tests/*/*.*.png
@@ -12,77 +9,129 @@ CSharpMath.Xaml.Tests.NuGet/Test.*.png
/.benchmarkresults
/.nupkgs
/.testcoverage
-
## END Specifically added for CSharpMath
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
# User-specific files
+*.rsuser
*.suo
*.user
*.userosscache
*.sln.docstates
+*.env
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
+# Mono auto generated files
+mono_crash.*
+
# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
-x64/
-x86/
+
+[Dd]ebug/x64/
+[Dd]ebugPublic/x64/
+[Rr]elease/x64/
+[Rr]eleases/x64/
+bin/x64/
+obj/x64/
+
+[Dd]ebug/x86/
+[Dd]ebugPublic/x86/
+[Rr]elease/x86/
+[Rr]eleases/x86/
+bin/x86/
+obj/x86/
+
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+[Aa][Rr][Mm]64[Ee][Cc]/
bld/
-[Bb]in/
[Oo]bj/
+[Oo]ut/
[Ll]og/
+[Ll]ogs/
+
+# Build results on 'Bin' directories
+**/[Bb]in/*
+# Uncomment if you have tasks that rely on *.refresh files to move binaries
+# (https://github.com/github/gitignore/pull/3736)
+#!**/[Bb]in/*.refresh
-# Visual Studio 2015 cache/options directory
+# Visual Studio 2015/2017 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
+*.trx
-# NUNIT
+# NUnit
*.VisualState.xml
TestResult.xml
+nunit-*.xml
+
+# Approval Tests result files
+*.received.*
# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
-**/Properties/launchSettings.json
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
*_i.c
*_p.c
-*_i.h
+*_h.h
*.ilk
*.meta
*.obj
+*.idb
+*.iobj
*.pch
*.pdb
+*.ipdb
*.pgc
*.pgd
*.rsp
+# but not Directory.Build.rsp, as it configures directory-level build defaults
+!Directory.Build.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
+*_wpftmp.csproj
*.log
+*.tlog
*.vspscc
*.vssscc
.builds
@@ -110,6 +159,9 @@ ipch/
*.vspx
*.sap
+# Visual Studio Trace Files
+*.e2e
+
# TFS 2012 Local Workspace
$tf/
@@ -121,21 +173,28 @@ _ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
-# JustCode is a .NET coding add-in
-.JustCode
-
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
# Visual Studio code coverage results
*.coverage
*.coveragexml
# NCrunch
_NCrunch_*
+.NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*
@@ -165,7 +224,7 @@ publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
+# Note: Comment the next line if you want to checkin your web deploy settings,
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
@@ -177,12 +236,14 @@ PublishScripts/
# NuGet Packages
*.nupkg
+# NuGet Symbol Packages
+*.snupkg
# The packages folder can be ignored because of Package Restore
-**/packages/*
+**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
-!**/packages/build/
+!**/[Pp]ackages/build/
# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
+#!**/[Pp]ackages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets
@@ -200,12 +261,15 @@ AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
-!*.[Cc]ache/
+!?*.[Cc]ache/
# Others
ClientBin/
@@ -218,6 +282,10 @@ ClientBin/
*.publishsettings
orleans.codegen.cs
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
@@ -232,6 +300,8 @@ _UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
# SQL Server files
*.mdf
@@ -242,6 +312,10 @@ UpgradeLog*.htm
*.rdl.data
*.bim.layout
*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
# Microsoft Fakes
FakesAssemblies/
@@ -253,9 +327,6 @@ FakesAssemblies/
.ntvs_analysis.dat
node_modules/
-# Typescript v1 declaration files
-typings/
-
# Visual Studio 6 build log
*.plg
@@ -265,6 +336,14 @@ typings/
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+*.ncb
+*.aps
+
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
@@ -274,26 +353,25 @@ typings/
_Pvt_Extensions
# Paket dependency manager
-.paket/paket.exe
+**/.paket/paket.exe
paket-files/
# FAKE - F# Make
-.fake/
-
-# JetBrains Rider
-.idea/
-*.sln.iml
+**/.fake/
-# CodeRush
-.cr/
+# CodeRush personal settings
+**/.cr/personal
# Python Tools for Visual Studio (PTVS)
-__pycache__/
+**/__pycache__/
*.pyc
# Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
+#tools/**
+#!tools/packages.config
+
+# Tabs Studio
+*.tss
# Telerik's JustMock configuration file
*.jmconfig
@@ -304,8 +382,60 @@ __pycache__/
*.odx.cs
*.xsd.cs
-# ignore Xamarin.Android Resource.Designer.cs files
-**/*.Droid/**/[Rr]esource.[Dd]esigner.cs
-**/*.Android/**/[Rr]esource.[Dd]esigner.cs
-**/Android/**/[Rr]esource.[Dd]esigner.cs
-**/Droid/**/[Rr]esource.[Dd]esigner.cs
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+MSBuild_Logs/
+
+# AWS SAM Build and Temporary Artifacts folder
+.aws-sam
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+**/.mfractor/
+
+# Local History for Visual Studio
+**/.localhistory/
+
+# Visual Studio History (VSHistory) files
+.vshistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+**/.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
\ No newline at end of file
diff --git a/CSharpMath.Maui.Example/App.xaml b/CSharpMath.Maui.Example/App.xaml
index 255f815de..b26d98216 100644
--- a/CSharpMath.Maui.Example/App.xaml
+++ b/CSharpMath.Maui.Example/App.xaml
@@ -2,6 +2,7 @@
@@ -17,6 +18,33 @@
+
+ 1
+ 2
+ 4
+ 8
+ 12
+ 16
+ 20
+ 24
+ 30
+ 36
+ 48
+ 60
+ 72
+ 96
+ 108
+ 144
+ 192
+ 288
+ 384
+ 480
+ 576
+ 666
+ 768
+ 864
+ 960
+
diff --git a/CSharpMath.Maui.Example/TextPage.xaml b/CSharpMath.Maui.Example/TextPage.xaml
index 8e4b57ba5..867b7cf33 100644
--- a/CSharpMath.Maui.Example/TextPage.xaml
+++ b/CSharpMath.Maui.Example/TextPage.xaml
@@ -5,7 +5,7 @@
xmlns:local="clr-namespace:CSharpMath.Maui.Example"
x:Class="CSharpMath.Maui.Example.TextPage"
Title="Text">
-
+
diff --git a/CSharpMath.Maui.Example/TryPage.xaml b/CSharpMath.Maui.Example/TryPage.xaml
index 28eebbce9..9debfbc16 100644
--- a/CSharpMath.Maui.Example/TryPage.xaml
+++ b/CSharpMath.Maui.Example/TryPage.xaml
@@ -5,16 +5,29 @@
xmlns:local="clr-namespace:CSharpMath.Maui.Example"
x:Class="CSharpMath.Maui.Example.TryPage"
Title="Try">
+
+
+
-
+
-
+
-
-
+
+
-
diff --git a/CSharpMath.Maui.Example/TryPage.xaml.cs b/CSharpMath.Maui.Example/TryPage.xaml.cs
index d13c7ee11..a02ab4fd7 100644
--- a/CSharpMath.Maui.Example/TryPage.xaml.cs
+++ b/CSharpMath.Maui.Example/TryPage.xaml.cs
@@ -1,19 +1,10 @@
+using System.Globalization;
+
namespace CSharpMath.Maui.Example {
public partial class TryPage : ContentPage {
- public static float[] FontSizes = new float[] {
- 1, 2, 4, 8, 12, 16, 20, 24, 30, 36, 48, 60, 72, 96, 108, 144, 192,
- 288, 384, 480, 576, 666 /*(insert trollface here)*/, 768, 864, 960
- };
public TryPage() {
InitializeComponent();
Size.SelectedItem = View.FontSize;
- Size.SelectedIndexChanged += (sender, e) => View.FontSize = (float)Size.SelectedItem;
- Entry.TextChanged += (sender, e) => {
- View.LaTeX = Entry.Text;
- if (View.ErrorMessage is { })
- Exit.FormattedText = new() { Spans = { new() { Text = View.LaTeX, TextColor = Colors.Red, FontSize = Exit.FontSize } } };
- else Exit.Text = View.LaTeX;
- };
Picker.ItemsSource = Rendering.Tests.TestRenderingMathData.AllConstants.Keys.ToList();
Picker.SelectedIndexChanged += (sender, e) => {
if (Picker.SelectedItem is string s) View.LaTeX = Entry.Text = Rendering.Tests.TestRenderingMathData.AllConstants[s];
@@ -21,11 +12,13 @@ public TryPage() {
var values = typeof(Rendering.FrontEnd.TextAlignment).GetEnumValues();
Array.Reverse(values);
Alignment.ItemsSource = values;
- Alignment.SelectedIndexChanged += (sender, e) => View.TextAlignment = (Rendering.FrontEnd.TextAlignment)Alignment.SelectedItem;
Alignment.SelectedItem = View.TextAlignment;
}
- private void Button_Clicked(object sender, System.EventArgs e) {
+ private void Button_Clicked(object sender, EventArgs e) =>
View.DisplacementX = View.DisplacementY = 0;
- }
+ }
+ public class IsNotNullConverter : IValueConverter {
+ public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) => value is not null;
+ public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => throw new NotImplementedException();
}
}
diff --git a/CSharpMath.SkiaSharp/TextPainter.cs b/CSharpMath.SkiaSharp/TextPainter.cs
index b48d83ea1..e150c9d2b 100644
--- a/CSharpMath.SkiaSharp/TextPainter.cs
+++ b/CSharpMath.SkiaSharp/TextPainter.cs
@@ -4,9 +4,9 @@
namespace CSharpMath.SkiaSharp {
public class TextPainter : TextPainter {
+ public bool AntiAlias { get; set; } = true;
public override Color WrapColor(SKColor color) => color.FromNative();
public override SKColor UnwrapColor(Color color) => color.ToNative();
- public override ICanvas WrapCanvas(SKCanvas canvas) =>
- new SkiaCanvas(canvas, true);
+ public override ICanvas WrapCanvas(SKCanvas canvas) => new SkiaCanvas(canvas, AntiAlias);
}
}
diff --git a/CSharpMath.Uno.Example/.run/CSharpMath.Uno.Example.run.xml b/CSharpMath.Uno.Example/.run/CSharpMath.Uno.Example.run.xml
new file mode 100644
index 000000000..8ef29e5a6
--- /dev/null
+++ b/CSharpMath.Uno.Example/.run/CSharpMath.Uno.Example.run.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CSharpMath.Uno.Example/.run/Readme.md b/CSharpMath.Uno.Example/.run/Readme.md
new file mode 100644
index 000000000..6e72638a0
--- /dev/null
+++ b/CSharpMath.Uno.Example/.run/Readme.md
@@ -0,0 +1,3 @@
+# About the `.run` folder
+
+This folder is present to add support for the [Rider IDE](https://aka.platform.uno/rider-getstarted). You can remove this folder safely if you're not using Rider.
diff --git a/CSharpMath.Uno.Example/.vscode/extensions.json b/CSharpMath.Uno.Example/.vscode/extensions.json
new file mode 100644
index 000000000..a63ad4009
--- /dev/null
+++ b/CSharpMath.Uno.Example/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+ "recommendations": [
+ "unoplatform.vscode"
+ ],
+}
diff --git a/CSharpMath.Uno.Example/.vscode/launch.json b/CSharpMath.Uno.Example/.vscode/launch.json
new file mode 100644
index 000000000..e7fb694ea
--- /dev/null
+++ b/CSharpMath.Uno.Example/.vscode/launch.json
@@ -0,0 +1,77 @@
+{
+ // Use IntelliSense to find out which attributes exist for C# debugging
+ // Use hover for the description of the existing attributes
+ // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": "Uno Platform Mobile Debug",
+ "type": "Uno",
+ "request": "launch",
+ // any Uno* task will do, this is simply to satisfy vscode requirement when a launch.json is present
+ "preLaunchTask": "Uno: android | Debug | android-x64"
+ },
+ {
+ // Use IntelliSense to find out which attributes exist for C# debugging
+ // Use hover for the description of the existing attributes
+ // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+ "name": "Uno Platform WebAssembly Debug (Chrome)",
+ "type": "chrome",
+ "request": "launch",
+ "url": "http://localhost:5000",
+ "webRoot": "${workspaceFolder}/CSharpMath.Uno.Example",
+ "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+ "timeout": 30000,
+ "preLaunchTask": "build-wasm",
+ "server": {
+ "runtimeExecutable": "dotnet",
+ "program": "run",
+ "args": ["--no-build","-f","net10.0-browserwasm","--launch-profile", "CSharpMath.Uno.Example (WebAssembly)"],
+ "outputCapture": "std",
+ "timeout": 30000,
+ "cwd": "${workspaceFolder}/CSharpMath.Uno.Example"
+ }
+ },
+ {
+ // Use IntelliSense to find out which attributes exist for C# debugging
+ // Use hover for the description of the existing attributes
+ // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+ "name": "Uno Platform WebAssembly Debug (Edge)",
+ "type": "msedge",
+ "request": "launch",
+ "url": "http://localhost:5000",
+ "webRoot": "${workspaceFolder}/CSharpMath.Uno.Example",
+ "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+ "timeout": 30000,
+ "preLaunchTask": "build-wasm",
+ "server": {
+ "runtimeExecutable": "dotnet",
+ "program": "run",
+ "args": ["--no-build","-f","net10.0-browserwasm","--launch-profile", "CSharpMath.Uno.Example (WebAssembly)"],
+ "outputCapture": "std",
+ "timeout": 30000,
+ "cwd": "${workspaceFolder}/CSharpMath.Uno.Example"
+ }
+ },
+ {
+ // Use IntelliSense to find out which attributes exist for C# debugging
+ // Use hover for the description of the existing attributes
+ // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+ "name": "Uno Platform Desktop Debug",
+ "type": "coreclr",
+ "request": "launch",
+ "preLaunchTask": "build-desktop",
+ // If you have changed target frameworks, make sure to update the program path.
+ "program": "${workspaceFolder}/CSharpMath.Uno.Example/bin/Debug/net10.0-desktop/CSharpMath.Uno.Example.dll",
+ "args": [],
+ "launchSettingsProfile": "CSharpMath.Uno.Example (Desktop)",
+ "env": {
+ "DOTNET_MODIFIABLE_ASSEMBLIES": "debug"
+ },
+ "cwd": "${workspaceFolder}/CSharpMath.Uno.Example",
+ // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+ "console": "internalConsole",
+ "stopAtEntry": false
+ },
+ ]
+}
diff --git a/CSharpMath.Uno.Example/.vscode/settings.json b/CSharpMath.Uno.Example/.vscode/settings.json
new file mode 100644
index 000000000..3405922d5
--- /dev/null
+++ b/CSharpMath.Uno.Example/.vscode/settings.json
@@ -0,0 +1,10 @@
+{
+ "explorer.fileNesting.enabled": true,
+ "explorer.fileNesting.expand": false,
+ "explorer.fileNesting.patterns": {
+ "*.xaml": "$(capture).xaml.cs"
+ },
+ "files.associations": {
+ "global.json": "jsonc"
+ }
+}
diff --git a/CSharpMath.Uno.Example/.vscode/tasks.json b/CSharpMath.Uno.Example/.vscode/tasks.json
new file mode 100644
index 000000000..7f6845ee2
--- /dev/null
+++ b/CSharpMath.Uno.Example/.vscode/tasks.json
@@ -0,0 +1,57 @@
+{
+ "version": "2.0.0",
+ "tasks": [
+ {
+ "label": "build-wasm",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "build",
+ "${workspaceFolder}/CSharpMath.Uno.Example/CSharpMath.Uno.Example.csproj",
+ "/property:GenerateFullPaths=true",
+ "/property:TargetFramework=net10.0-browserwasm",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "publish-wasm",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "publish",
+ "${workspaceFolder}/CSharpMath.Uno.Example/CSharpMath.Uno.Example.csproj",
+ "/property:GenerateFullPaths=true",
+ "/property:TargetFramework=net10.0-browserwasm",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "build-desktop",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "build",
+ "${workspaceFolder}/CSharpMath.Uno.Example/CSharpMath.Uno.Example.csproj",
+ "/property:GenerateFullPaths=true",
+ "/property:TargetFramework=net10.0-desktop",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "publish-desktop",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "publish",
+ "${workspaceFolder}/CSharpMath.Uno.Example/CSharpMath.Uno.Example.csproj",
+ "/property:GenerateFullPaths=true",
+ "/property:TargetFramework=net10.0-desktop",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ }
+ ]
+}
diff --git a/CSharpMath.Uno.Example/App.xaml b/CSharpMath.Uno.Example/App.xaml
new file mode 100644
index 000000000..8ee4e8d68
--- /dev/null
+++ b/CSharpMath.Uno.Example/App.xaml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CSharpMath.Uno.Example/App.xaml.cs b/CSharpMath.Uno.Example/App.xaml.cs
new file mode 100644
index 000000000..f197edc28
--- /dev/null
+++ b/CSharpMath.Uno.Example/App.xaml.cs
@@ -0,0 +1,133 @@
+using System;
+using Microsoft.Extensions.Logging;
+using Uno.Resizetizer;
+
+namespace CSharpMath.Uno.Example;
+
+public partial class App : Application
+{
+ ///
+ /// Initializes the singleton application object. This is the first line of authored code
+ /// executed, and as such is the logical equivalent of main() or WinMain().
+ ///
+ public App()
+ {
+ this.InitializeComponent();
+ }
+
+ protected Window? MainWindow { get; private set; }
+
+ protected override void OnLaunched(LaunchActivatedEventArgs args)
+ {
+ MainWindow = new Window();
+#if DEBUG
+ MainWindow.UseStudio();
+#endif
+
+
+ // Do not repeat app initialization when the Window already has content,
+ // just ensure that the window is active
+ if (MainWindow.Content is not Frame rootFrame)
+ {
+ // Create a Frame to act as the navigation context and navigate to the first page
+ rootFrame = new Frame();
+
+ // Place the frame in the current Window
+ MainWindow.Content = rootFrame;
+
+ rootFrame.NavigationFailed += OnNavigationFailed;
+ }
+
+ if (rootFrame.Content == null)
+ {
+ // When the navigation stack isn't restored navigate to the first page,
+ // configuring the new page by passing required information as a navigation
+ // parameter
+ rootFrame.Navigate(typeof(MainPage), args.Arguments);
+ }
+
+ MainWindow.SetWindowIcon();
+ // Ensure the current window is active
+ MainWindow.Activate();
+ }
+
+ ///
+ /// Invoked when Navigation to a certain page fails
+ ///
+ /// The Frame which failed navigation
+ /// Details about the navigation failure
+ void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
+ {
+ throw new InvalidOperationException($"Failed to load {e.SourcePageType.FullName}: {e.Exception}");
+ }
+
+ ///
+ /// Configures global Uno Platform logging
+ ///
+ public static void InitializeLogging()
+ {
+#if DEBUG
+ // Logging is disabled by default for release builds, as it incurs a significant
+ // initialization cost from Microsoft.Extensions.Logging setup. If startup performance
+ // is a concern for your application, keep this disabled. If you're running on the web or
+ // desktop targets, you can use URL or command line parameters to enable it.
+ //
+ // For more performance documentation: https://platform.uno/docs/articles/Uno-UI-Performance.html
+
+ var factory = LoggerFactory.Create(builder =>
+ {
+#if __WASM__
+ builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider());
+#elif __IOS__
+ builder.AddProvider(new global::Uno.Extensions.Logging.OSLogLoggerProvider());
+
+ // Log to the Visual Studio Debug console
+ builder.AddConsole();
+#else
+ builder.AddConsole();
+#endif
+
+ // Exclude logs below this level
+ builder.SetMinimumLevel(LogLevel.Information);
+
+ // Default filters for Uno Platform namespaces
+ builder.AddFilter("Uno", LogLevel.Warning);
+ builder.AddFilter("Windows", LogLevel.Warning);
+ builder.AddFilter("Microsoft", LogLevel.Warning);
+
+ // Generic Xaml events
+ // builder.AddFilter("Microsoft.UI.Xaml", LogLevel.Debug );
+ // builder.AddFilter("Microsoft.UI.Xaml.VisualStateGroup", LogLevel.Debug );
+ // builder.AddFilter("Microsoft.UI.Xaml.StateTriggerBase", LogLevel.Debug );
+ // builder.AddFilter("Microsoft.UI.Xaml.UIElement", LogLevel.Debug );
+ // builder.AddFilter("Microsoft.UI.Xaml.FrameworkElement", LogLevel.Trace );
+
+ // Layouter specific messages
+ // builder.AddFilter("Microsoft.UI.Xaml.Controls", LogLevel.Debug );
+ // builder.AddFilter("Microsoft.UI.Xaml.Controls.Layouter", LogLevel.Debug );
+ // builder.AddFilter("Microsoft.UI.Xaml.Controls.Panel", LogLevel.Debug );
+
+ // builder.AddFilter("Windows.Storage", LogLevel.Debug );
+
+ // Binding related messages
+ // builder.AddFilter("Microsoft.UI.Xaml.Data", LogLevel.Debug );
+ // builder.AddFilter("Microsoft.UI.Xaml.Data", LogLevel.Debug );
+
+ // Binder memory references tracking
+ // builder.AddFilter("Uno.UI.DataBinding.BinderReferenceHolder", LogLevel.Debug );
+
+ // DevServer and HotReload related
+ // builder.AddFilter("Uno.UI.RemoteControl", LogLevel.Information);
+
+ // Debug JS interop
+ // builder.AddFilter("Uno.Foundation.WebAssemblyRuntime", LogLevel.Debug );
+ });
+
+ global::Uno.Extensions.LogExtensionPoint.AmbientLoggerFactory = factory;
+
+#if HAS_UNO
+ global::Uno.UI.Adapter.Microsoft.Extensions.Logging.LoggingAdapter.Initialize();
+#endif
+#endif
+ }
+}
diff --git a/CSharpMath.Uno.Example/Assets/Icons/icon.svg b/CSharpMath.Uno.Example/Assets/Icons/icon.svg
new file mode 100644
index 000000000..a15af53aa
--- /dev/null
+++ b/CSharpMath.Uno.Example/Assets/Icons/icon.svg
@@ -0,0 +1,42 @@
+
+
diff --git a/CSharpMath.Uno.Example/Assets/Icons/icon_foreground.svg b/CSharpMath.Uno.Example/Assets/Icons/icon_foreground.svg
new file mode 100644
index 000000000..8ffc41ae3
--- /dev/null
+++ b/CSharpMath.Uno.Example/Assets/Icons/icon_foreground.svg
@@ -0,0 +1,137 @@
+
+
diff --git a/CSharpMath.Uno.Example/Assets/SharedAssets.md b/CSharpMath.Uno.Example/Assets/SharedAssets.md
new file mode 100644
index 000000000..b1cc4e762
--- /dev/null
+++ b/CSharpMath.Uno.Example/Assets/SharedAssets.md
@@ -0,0 +1,32 @@
+# Shared Assets
+
+See documentation about assets here: https://github.com/unoplatform/uno/blob/master/doc/articles/features/working-with-assets.md
+
+## Here is a cheat sheet
+
+1. Add the image file to the `Assets` directory of a shared project.
+2. Set the build action to `Content`.
+3. (Recommended) Provide an asset for various scales/dpi
+
+### Examples
+
+```text
+\Assets\Images\logo.scale-100.png
+\Assets\Images\logo.scale-200.png
+\Assets\Images\logo.scale-400.png
+
+\Assets\Images\scale-100\logo.png
+\Assets\Images\scale-200\logo.png
+\Assets\Images\scale-400\logo.png
+```
+
+### Table of scales
+
+| Scale | WinUI | iOS | Android |
+|-------|:-----------:|:---------------:|:-------:|
+| `100` | scale-100 | @1x | mdpi |
+| `125` | scale-125 | N/A | N/A |
+| `150` | scale-150 | N/A | hdpi |
+| `200` | scale-200 | @2x | xhdpi |
+| `300` | scale-300 | @3x | xxhdpi |
+| `400` | scale-400 | N/A | xxxhdpi |
diff --git a/CSharpMath.Uno.Example/Assets/Splash/splash_screen.svg b/CSharpMath.Uno.Example/Assets/Splash/splash_screen.svg
new file mode 100644
index 000000000..8ffc41ae3
--- /dev/null
+++ b/CSharpMath.Uno.Example/Assets/Splash/splash_screen.svg
@@ -0,0 +1,137 @@
+
+
diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.csproj b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.csproj
new file mode 100644
index 000000000..fe868486f
--- /dev/null
+++ b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.csproj
@@ -0,0 +1,33 @@
+
+
+ net10.0-android;net10.0-browserwasm;net10.0-desktop
+ $(TargetFrameworks);net10.0-ios
+ $(TargetFrameworks);net10.0-windows10.0.19041.0
+
+ Exe
+ true
+ enable
+
+
+ CSharpMath.Uno.Example
+
+ com.companyname.csharpmath-uno-example
+
+ 1.0
+ 1
+
+ CSharpMath.Uno.Example
+
+ CSharpMath.Uno.Example powered by Uno Platform.
+
+
+ SkiaRenderer
+
+
+
+
+
+
diff --git a/CSharpMath.Uno.Example/MainPage.xaml b/CSharpMath.Uno.Example/MainPage.xaml
new file mode 100644
index 000000000..e809131e0
--- /dev/null
+++ b/CSharpMath.Uno.Example/MainPage.xaml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CSharpMath.Uno.Example/MainPage.xaml.cs b/CSharpMath.Uno.Example/MainPage.xaml.cs
new file mode 100644
index 000000000..2fc9db9f5
--- /dev/null
+++ b/CSharpMath.Uno.Example/MainPage.xaml.cs
@@ -0,0 +1,9 @@
+namespace CSharpMath.Uno.Example;
+
+public sealed partial class MainPage : Page
+{
+ public MainPage()
+ {
+ this.InitializeComponent();
+ }
+}
diff --git a/CSharpMath.Uno.Example/Package.appxmanifest b/CSharpMath.Uno.Example/Package.appxmanifest
new file mode 100644
index 000000000..9ef381467
--- /dev/null
+++ b/CSharpMath.Uno.Example/Package.appxmanifest
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CSharpMath.Uno.Example/Pages/ClockPage.xaml b/CSharpMath.Uno.Example/Pages/ClockPage.xaml
new file mode 100644
index 000000000..96b20c57b
--- /dev/null
+++ b/CSharpMath.Uno.Example/Pages/ClockPage.xaml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CSharpMath.Uno.Example/Pages/ClockPage.xaml.cs b/CSharpMath.Uno.Example/Pages/ClockPage.xaml.cs
new file mode 100644
index 000000000..161aacab3
--- /dev/null
+++ b/CSharpMath.Uno.Example/Pages/ClockPage.xaml.cs
@@ -0,0 +1,113 @@
+using CSharpMath.SkiaSharp;
+using SkiaSharp;
+using SkiaSharp.Views.Windows;
+using static System.Math;
+
+namespace CSharpMath.Uno.Example {
+ public sealed partial class ClockPage : Page {
+ private readonly DispatcherTimer _timer;
+
+ public ClockPage() {
+ this.InitializeComponent();
+ _timer = new DispatcherTimer();
+ _timer.Interval = TimeSpan.FromMilliseconds(200);
+ _timer.Tick += (s, e) => {
+ canvasView.Invalidate();
+ };
+ this.Loaded += ClockPage_Loaded;
+ this.Unloaded += ClockPage_Unloaded;
+ }
+
+ private void ClockPage_Loaded(object sender, RoutedEventArgs e) {
+ _timer.Start();
+ }
+
+ private void ClockPage_Unloaded(object sender, RoutedEventArgs e) {
+ _timer.Stop();
+ }
+
+ readonly SKPaint blackFillPaint = new SKPaint {
+ Style = SKPaintStyle.Fill,
+ Color = SKColors.Black
+ };
+ readonly SKPaint whiteFillPaint = new SKPaint {
+ Style = SKPaintStyle.Fill,
+ Color = SKColors.White
+ };
+ readonly SKPaint whiteStrokePaint = new SKPaint {
+ Style = SKPaintStyle.Stroke,
+ Color = SKColors.White,
+ StrokeCap = SKStrokeCap.Round,
+ IsAntialias = true
+ };
+ readonly SKPaint redStrokePaint = new SKPaint {
+ Style = SKPaintStyle.Stroke,
+ Color = SKColors.Red,
+ StrokeCap = SKStrokeCap.Round,
+ IsAntialias = true
+ };
+ readonly string[] labels = {
+ // Four 4s make 1 to 12 using different operations
+ @"$\frac{44+4}{4}$",
+ @"$\frac{44}{44}$",
+ @"$\frac{4}{4}+\frac{4}{4}$",
+ @"$\frac{4+4+4}{4}$",
+ @"$4+\frac{4-4}{4}$",
+ @"$4+4^{4-4}$",
+ @"$4+\frac{4+4}{4}$",
+ @"$\frac{44}{4}-4$",
+ @"$\sqrt{4}^{4-\frac{4}{4}}$",
+ @"$\:\:(4-\frac{4}{4})^{\sqrt{4}}$",
+ @"$\frac{44-4}{4}$",
+ @"$\frac{4!}{\sqrt{4}}-\frac{4}{4}$"
+ };
+ private void CanvasView_PaintSurface(object sender, SKPaintSurfaceEventArgs e) {
+ var canvas = e.Surface.Canvas;
+ canvas.Clear(SKColors.CornflowerBlue);
+ canvas.Translate(e.Info.Width / 2, e.Info.Height / 2);
+ var minWidthHeight = Min(e.Info.Width, e.Info.Height);
+ canvas.Scale(minWidthHeight / 210f);
+ canvas.DrawCircle(0, 0, 100, blackFillPaint);
+ var painter = new TextPainter { FontSize = 8, TextColor = SKColors.White };
+ for (int i = 0; i < 60; i++) {
+ // Dots
+ canvas.Save();
+ canvas.RotateDegrees(6 * i);
+ canvas.DrawCircle(0, -90, i % 5 == 0 ? 4 : 2, whiteFillPaint);
+ canvas.Restore();
+ // Maths
+ if (i % 5 == 0) {
+ painter.LaTeX = labels[i / 5];
+ if (!(painter.Measure(e.Info.Width) is { } measure))
+ throw new Atom.InvalidCodePathException("Invalid LaTeX");
+ var θ = (90 - 6 * i) / 180f * PI;
+ var sinθ = (float)Sin(θ);
+ var cosθ = (float)Cos(θ);
+ painter.Draw(canvas,
+ new System.Drawing.PointF(75 * cosθ - (float)measure.Width / 2,
+ -75 * sinθ - (float)measure.Height / 2),
+ float.PositiveInfinity);
+ }
+ }
+ var dateTime = DateTime.Now;
+ // H
+ canvas.Save();
+ canvas.RotateDegrees(30 * dateTime.Hour + dateTime.Minute / 2f);
+ whiteStrokePaint.StrokeWidth = 12;
+ canvas.DrawLine(0, 0, 0, -50, whiteStrokePaint);
+ canvas.Restore();
+ // M
+ canvas.Save();
+ canvas.RotateDegrees(6 * dateTime.Minute + dateTime.Second / 10f);
+ whiteStrokePaint.StrokeWidth = 6;
+ canvas.DrawLine(0, 0, 0, -65, whiteStrokePaint);
+ canvas.Restore();
+ // S
+ canvas.Save();
+ canvas.RotateDegrees(6f * (dateTime.Second + dateTime.Millisecond / 1000f));
+ redStrokePaint.StrokeWidth = 2;
+ canvas.DrawLine(0, 0, 0, -75, redStrokePaint);
+ canvas.Restore();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CSharpMath.Uno.Example/Pages/TextPage.xaml b/CSharpMath.Uno.Example/Pages/TextPage.xaml
new file mode 100644
index 000000000..39f9d917e
--- /dev/null
+++ b/CSharpMath.Uno.Example/Pages/TextPage.xaml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CSharpMath.Uno.Example/Pages/TextPage.xaml.cs b/CSharpMath.Uno.Example/Pages/TextPage.xaml.cs
new file mode 100644
index 000000000..606b5c317
--- /dev/null
+++ b/CSharpMath.Uno.Example/Pages/TextPage.xaml.cs
@@ -0,0 +1,11 @@
+namespace CSharpMath.Uno.Example;
+
+using Microsoft.UI;
+using Microsoft.UI.Xaml.Media;
+
+public sealed partial class TextPage : Page {
+ public static float[] FontSizes { get; } = TryPage.FontSizes;
+ public TextPage() {
+ InitializeComponent();
+ }
+}
\ No newline at end of file
diff --git a/CSharpMath.Uno.Example/Pages/TryPage.xaml b/CSharpMath.Uno.Example/Pages/TryPage.xaml
new file mode 100644
index 000000000..dc4aa5709
--- /dev/null
+++ b/CSharpMath.Uno.Example/Pages/TryPage.xaml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CSharpMath.Uno.Example/Pages/TryPage.xaml.cs b/CSharpMath.Uno.Example/Pages/TryPage.xaml.cs
new file mode 100644
index 000000000..c074e600b
--- /dev/null
+++ b/CSharpMath.Uno.Example/Pages/TryPage.xaml.cs
@@ -0,0 +1,77 @@
+namespace CSharpMath.Uno.Example;
+
+using Microsoft.UI;
+using Microsoft.UI.Xaml.Media;
+
+public sealed partial class TryPage : Page {
+ public static float[] FontSizes { get; } = [
+ 1, 2, 4, 8, 12, 16, 20, 24, 30, 36, 48, 60, 72, 96, 108, 144, 192,
+ 288, 384, 480, 576, 666, 768, 864, 960
+ ];
+
+ public Rendering.FrontEnd.TextAlignment[] AlignmentValues { get; }
+
+ public TryPage() {
+ var values = (Rendering.FrontEnd.TextAlignment[])typeof(Rendering.FrontEnd.TextAlignment).GetEnumValues();
+ System.Array.Reverse(values);
+ AlignmentValues = values;
+ InitializeComponent();
+ Alignment.SelectedItem = View.TextAlignment;
+ View.RegisterPropertyChangedCallback(MathView.ErrorMessageProperty, (sender, dp) => {
+ Exit.Foreground = View.ErrorMessage is not null
+ ? new SolidColorBrush(Colors.Red)
+ : (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
+ });
+ }
+
+ private void ResetPan_Clicked(object sender, RoutedEventArgs e) {
+ View.DisplacementX = View.DisplacementY = 0;
+ }
+
+ private async void Calculate_Clicked(object sender, RoutedEventArgs e) {
+ if (View.Painter.Content is not { } content) return;
+ var popupView = new MathView {
+ FontSize = 32,
+ EnablePanning = true,
+ TextAlignment = Rendering.FrontEnd.TextAlignment.TopLeft,
+ LaTeX = CSharpMath.Evaluation.Interpret(content),
+ HorizontalAlignment = HorizontalAlignment.Stretch,
+ VerticalAlignment = VerticalAlignment.Stretch,
+ TextColor = View.TextColor,
+ Width = 400,
+ Height = 300
+ };
+ static Button Tap(Button button, Action handler) {
+ button.Tapped += (s, e) => handler(s, e);
+ return button;
+ }
+ var dialog = new ContentDialog {
+ Title = "Calculation Result",
+ Content = new StackPanel {
+ Spacing = 10,
+ Children = {
+ new StackPanel {
+ Orientation = Orientation.Horizontal,
+ Spacing = 10,
+ Children = {
+ Tap(new Button {
+ Content = "Reset pan"
+ }, (s, _) => popupView.DisplacementX = popupView.DisplacementY = 0)
+ }
+ },
+ popupView
+ }
+ },
+ CloseButtonText = "Close",
+ XamlRoot = this.XamlRoot
+ };
+
+ popupView.Loaded += (s, e) => {
+ // Force the MathView to render after the dialog is loaded by forcing a measure and invalidate to ensure rendering
+ popupView.InvalidateMeasure();
+ popupView.Invalidate();
+ };
+
+ await dialog.ShowAsync();
+ }
+}
\ No newline at end of file
diff --git a/CSharpMath.Uno.Example/Platforms/Android/AndroidManifest.xml b/CSharpMath.Uno.Example/Platforms/Android/AndroidManifest.xml
new file mode 100644
index 000000000..95ae07533
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/Android/AndroidManifest.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/CSharpMath.Uno.Example/Platforms/Android/Assets/AboutAssets.txt b/CSharpMath.Uno.Example/Platforms/Android/Assets/AboutAssets.txt
new file mode 100644
index 000000000..89ab409df
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/Android/Assets/AboutAssets.txt
@@ -0,0 +1,22 @@
+To add cross-platform image assets for your Uno Platform app, use the Assets folder
+in the shared project instead. Assets in this folder are Android-only assets.
+
+Any raw assets you want to be deployed with your application can be placed in
+this directory (and child directories) and given a Build Action of "AndroidAsset".
+
+These files will be deployed with your package and will be accessible using Android's
+AssetManager, like this:
+
+public class ReadAsset : Activity
+{
+ protected override void OnCreate (Bundle bundle)
+ {
+ base.OnCreate (bundle);
+
+ InputStream input = Assets.Open ("my_asset.txt");
+ }
+}
+
+Additionally, some Android functions will automatically load asset files:
+
+Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
diff --git a/CSharpMath.Uno.Example/Platforms/Android/Main.Android.cs b/CSharpMath.Uno.Example/Platforms/Android/Main.Android.cs
new file mode 100644
index 000000000..bc07b61d9
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/Android/Main.Android.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+using Microsoft.UI.Xaml.Media;
+
+namespace CSharpMath.Uno.Example.Droid;
+
+[global::Android.App.ApplicationAttribute(
+ Label = "@string/ApplicationName",
+ Icon = "@mipmap/icon",
+ LargeHeap = true,
+ HardwareAccelerated = true,
+ Theme = "@style/Theme.App.Starting"
+)]
+public class Application : Microsoft.UI.Xaml.NativeApplication
+{
+ static Application()
+ {
+ App.InitializeLogging();
+ }
+
+ public Application(IntPtr javaReference, JniHandleOwnership transfer)
+ : base(() => new App(), javaReference, transfer)
+ {
+ }
+
+}
+
diff --git a/CSharpMath.Uno.Example/Platforms/Android/MainActivity.Android.cs b/CSharpMath.Uno.Example/Platforms/Android/MainActivity.Android.cs
new file mode 100644
index 000000000..b40eda0aa
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/Android/MainActivity.Android.cs
@@ -0,0 +1,23 @@
+using Android.App;
+using Android.Content.PM;
+using Android.OS;
+using Android.Views;
+using Android.Widget;
+
+namespace CSharpMath.Uno.Example.Droid;
+
+[Activity(
+ MainLauncher = true,
+ ConfigurationChanges = global::Uno.UI.ActivityHelper.AllConfigChanges,
+ WindowSoftInputMode = SoftInput.AdjustNothing | SoftInput.StateHidden
+)]
+public class MainActivity : Microsoft.UI.Xaml.ApplicationActivity
+{
+ protected override void OnCreate(Bundle? savedInstanceState)
+ {
+ global::AndroidX.Core.SplashScreen.SplashScreen.InstallSplashScreen(this);
+
+ base.OnCreate(savedInstanceState);
+ }
+
+}
diff --git a/CSharpMath.Uno.Example/Platforms/Android/Resources/AboutResources.txt b/CSharpMath.Uno.Example/Platforms/Android/Resources/AboutResources.txt
new file mode 100644
index 000000000..17e3b1333
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/Android/Resources/AboutResources.txt
@@ -0,0 +1,47 @@
+To add cross-platform image assets for your Uno Platform app, use the Assets folder
+in the shared project instead. Resources in this folder are Android-only.
+
+Images, layout descriptions, binary blobs and string dictionaries can be included
+in your application as resource files. Various Android APIs are designed to
+operate on the resource IDs instead of dealing with images, strings or binary blobs
+directly.
+
+For example, a sample Android app that contains a user interface layout (main.axml),
+an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png)
+would keep its resources in the "Resources" directory of the application:
+
+Resources/
+ drawable/
+ icon.png
+
+ layout/
+ main.axml
+
+ values/
+ strings.xml
+
+In order to get the build system to recognize Android resources, set the build action to
+"AndroidResource". The native Android APIs do not operate directly with filenames, but
+instead operate on resource IDs. When you compile an Android application that uses resources,
+the build system will package the resources for distribution and generate a class called "R"
+(this is an Android convention) that contains the tokens for each one of the resources
+included. For example, for the above Resources layout, this is what the R class would expose:
+
+public class R {
+ public class drawable {
+ public const int icon = 0x123;
+ }
+
+ public class layout {
+ public const int main = 0x456;
+ }
+
+ public class strings {
+ public const int first_string = 0xabc;
+ public const int second_string = 0xbcd;
+ }
+}
+
+You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main
+to reference the layout/main.axml file, or R.strings.first_string to reference the first
+string in the dictionary file values/strings.xml.
diff --git a/CSharpMath.Uno.Example/Platforms/Android/Resources/values/Strings.xml b/CSharpMath.Uno.Example/Platforms/Android/Resources/values/Strings.xml
new file mode 100644
index 000000000..4c50d2e64
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/Android/Resources/values/Strings.xml
@@ -0,0 +1,5 @@
+
+
+ Hello World, Click Me!
+ CSharpMath.Uno.Example
+
diff --git a/CSharpMath.Uno.Example/Platforms/Android/Resources/values/Styles.xml b/CSharpMath.Uno.Example/Platforms/Android/Resources/values/Styles.xml
new file mode 100644
index 000000000..f47dcf36b
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/Android/Resources/values/Styles.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
diff --git a/CSharpMath.Uno.Example/Platforms/Android/environment.conf b/CSharpMath.Uno.Example/Platforms/Android/environment.conf
new file mode 100644
index 000000000..d8c106452
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/Android/environment.conf
@@ -0,0 +1,2 @@
+# See this for more details: http://developer.xamarin.com/guides/android/advanced_topics/garbage_collection/
+MONO_GC_PARAMS=bridge-implementation=new,nursery-size=32m,soft-heap-limit=256m
\ No newline at end of file
diff --git a/CSharpMath.Uno.Example/Platforms/Desktop/Program.cs b/CSharpMath.Uno.Example/Platforms/Desktop/Program.cs
new file mode 100644
index 000000000..e2020a572
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/Desktop/Program.cs
@@ -0,0 +1,22 @@
+using Uno.UI.Hosting;
+
+namespace CSharpMath.Uno.Example;
+
+internal class Program
+{
+ [STAThread]
+ public static void Main(string[] args)
+ {
+ App.InitializeLogging();
+
+ var host = UnoPlatformHostBuilder.Create()
+ .App(() => new App())
+ .UseX11()
+ .UseLinuxFrameBuffer()
+ .UseMacOS()
+ .UseWin32()
+ .Build();
+
+ host.Run();
+ }
+}
diff --git a/CSharpMath.Uno.Example/Platforms/WebAssembly/LinkerConfig.xml b/CSharpMath.Uno.Example/Platforms/WebAssembly/LinkerConfig.xml
new file mode 100644
index 000000000..253aebefe
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/WebAssembly/LinkerConfig.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
diff --git a/CSharpMath.Uno.Example/Platforms/WebAssembly/Program.cs b/CSharpMath.Uno.Example/Platforms/WebAssembly/Program.cs
new file mode 100644
index 000000000..6ef69d370
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/WebAssembly/Program.cs
@@ -0,0 +1,18 @@
+using Uno.UI.Hosting;
+
+namespace CSharpMath.Uno.Example;
+
+public class Program
+{
+ public static async Task Main(string[] args)
+ {
+ App.InitializeLogging();
+
+ var host = UnoPlatformHostBuilder.Create()
+ .App(() => new App())
+ .UseWebAssembly()
+ .Build();
+
+ await host.RunAsync();
+ }
+}
\ No newline at end of file
diff --git a/CSharpMath.Uno.Example/Platforms/WebAssembly/WasmCSS/Fonts.css b/CSharpMath.Uno.Example/Platforms/WebAssembly/WasmCSS/Fonts.css
new file mode 100644
index 000000000..4fdd60555
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/WebAssembly/WasmCSS/Fonts.css
@@ -0,0 +1,28 @@
+/**
+ When adding fonts here, make sure to add them using a base64 data uri, otherwise
+ fonts loading are delayed, and text may get displayed incorrectly.
+*/
+
+/* https://github.com/unoplatform/uno/issues/3954 */
+@font-face {
+ font-family: 'Segoe UI';
+ src: local('Segoe UI'), local('-apple-system'), local('BlinkMacSystemFont'), local('Inter'), local('Cantarell'), local('Ubuntu'), local('Roboto'), local('Open Sans'), local('Noto Sans'), local('Helvetica Neue'), local('sans-serif');
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url(./Uno.Fonts.Roboto/Fonts/Roboto-Light.ttf) format('truetype');
+ font-weight: 300;
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url(./Uno.Fonts.Roboto/Fonts/Roboto-Regular.ttf) format('truetype');
+ font-weight: 400;
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url(./Uno.Fonts.Roboto/Fonts/Roboto-Medium.ttf) format('truetype');
+ font-weight: 500;
+}
diff --git a/CSharpMath.Uno.Example/Platforms/WebAssembly/WasmScripts/AppManifest.js b/CSharpMath.Uno.Example/Platforms/WebAssembly/WasmScripts/AppManifest.js
new file mode 100644
index 000000000..b7265be4e
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/WebAssembly/WasmScripts/AppManifest.js
@@ -0,0 +1,3 @@
+var UnoAppManifest = {
+ displayName: "CSharpMath.Uno.Example"
+}
diff --git a/CSharpMath.Uno.Example/Platforms/WebAssembly/manifest.webmanifest b/CSharpMath.Uno.Example/Platforms/WebAssembly/manifest.webmanifest
new file mode 100644
index 000000000..53f1a8df3
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/WebAssembly/manifest.webmanifest
@@ -0,0 +1,10 @@
+{
+ "background_color": "#ffffff",
+ "description": "CSharpMath.Uno.Example",
+ "display": "standalone",
+ "name": "CSharpMath.Uno.Example",
+ "short_name": "CSharpMath.Uno.Example",
+ "start_url": "/index.html",
+ "theme_color": "#ffffff",
+ "scope": "/"
+}
diff --git a/CSharpMath.Uno.Example/Platforms/WebAssembly/wwwroot/staticwebapp.config.json b/CSharpMath.Uno.Example/Platforms/WebAssembly/wwwroot/staticwebapp.config.json
new file mode 100644
index 000000000..79c1b17c4
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/WebAssembly/wwwroot/staticwebapp.config.json
@@ -0,0 +1,30 @@
+{
+ "navigationFallback": {
+ "rewrite": "/index.html",
+ "exclude": [
+ "*.{css,js}",
+ "*.{png}",
+ "*.{c,h,wasm,clr,pdb,dat,txt}"
+ ]
+ },
+ "routes": [
+ {
+ "route": "/package_*",
+ "headers": {
+ "cache-control": "public, immutable, max-age=31536000"
+ }
+ },
+ {
+ "route": "/*.ttf",
+ "headers": {
+ "cache-control": "public, immutable, max-age=31536000"
+ }
+ },
+ {
+ "route": "/*",
+ "headers": {
+ "cache-control": "must-revalidate, max-age=3600"
+ }
+ }
+ ]
+}
diff --git a/CSharpMath.Uno.Example/Platforms/WebAssembly/wwwroot/web.config b/CSharpMath.Uno.Example/Platforms/WebAssembly/wwwroot/web.config
new file mode 100644
index 000000000..8f5a860f5
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/WebAssembly/wwwroot/web.config
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CSharpMath.Uno.Example/Platforms/iOS/Entitlements.plist b/CSharpMath.Uno.Example/Platforms/iOS/Entitlements.plist
new file mode 100644
index 000000000..24c310368
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/iOS/Entitlements.plist
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/CSharpMath.Uno.Example/Platforms/iOS/Info.plist b/CSharpMath.Uno.Example/Platforms/iOS/Info.plist
new file mode 100644
index 000000000..ea3dcb4bc
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/iOS/Info.plist
@@ -0,0 +1,43 @@
+
+
+
+
+ LSRequiresIPhoneOS
+
+ UIDeviceFamily
+
+ 1
+ 2
+
+ UIRequiredDeviceCapabilities
+
+ armv7
+ arm64
+
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationPortrait
+ UIInterfaceOrientationLandscapeLeft
+ UIInterfaceOrientationLandscapeRight
+
+ UISupportedInterfaceOrientations~ipad
+
+ UIInterfaceOrientationPortrait
+ UIInterfaceOrientationPortraitUpsideDown
+ UIInterfaceOrientationLandscapeLeft
+ UIInterfaceOrientationLandscapeRight
+
+ UIViewControllerBasedStatusBarAppearance
+
+ XSAppIconAssets
+ Assets.xcassets/icon.appiconset
+ UIApplicationSupportsIndirectInputEvents
+
+
+
+
+
diff --git a/CSharpMath.Uno.Example/Platforms/iOS/Main.iOS.cs b/CSharpMath.Uno.Example/Platforms/iOS/Main.iOS.cs
new file mode 100644
index 000000000..97eb1711d
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/iOS/Main.iOS.cs
@@ -0,0 +1,20 @@
+using UIKit;
+using Uno.UI.Hosting;
+
+namespace CSharpMath.Uno.Example.iOS;
+
+public class EntryPoint
+{
+ // This is the main entry point of the application.
+ public static void Main(string[] args)
+ {
+ App.InitializeLogging();
+
+ var host = UnoPlatformHostBuilder.Create()
+ .App(() => new App())
+ .UseAppleUIKit()
+ .Build();
+
+ host.Run();
+ }
+}
diff --git a/CSharpMath.Uno.Example/Platforms/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json b/CSharpMath.Uno.Example/Platforms/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json
new file mode 100644
index 000000000..69555e440
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json
@@ -0,0 +1,58 @@
+{
+ "images": [
+ {
+ "orientation": "portrait",
+ "extent": "full-screen",
+ "minimum-system-version": "7.0",
+ "scale": "2x",
+ "size": "640x960",
+ "idiom": "iphone"
+ },
+ {
+ "orientation": "portrait",
+ "extent": "full-screen",
+ "minimum-system-version": "7.0",
+ "subtype": "retina4",
+ "scale": "2x",
+ "size": "640x1136",
+ "idiom": "iphone"
+ },
+ {
+ "orientation": "portrait",
+ "extent": "full-screen",
+ "minimum-system-version": "7.0",
+ "scale": "1x",
+ "size": "768x1024",
+ "idiom": "ipad"
+ },
+ {
+ "orientation": "landscape",
+ "extent": "full-screen",
+ "minimum-system-version": "7.0",
+ "scale": "1x",
+ "size": "1024x768",
+ "idiom": "ipad"
+ },
+ {
+ "orientation": "portrait",
+ "extent": "full-screen",
+ "minimum-system-version": "7.0",
+ "scale": "2x",
+ "size": "1536x2048",
+ "idiom": "ipad"
+ },
+ {
+ "orientation": "landscape",
+ "extent": "full-screen",
+ "minimum-system-version": "7.0",
+ "scale": "2x",
+ "size": "2048x1536",
+ "idiom": "ipad"
+ }
+ ],
+ "properties": {},
+ "info": {
+ "version": 1,
+ "author": ""
+ }
+}
\ No newline at end of file
diff --git a/CSharpMath.Uno.Example/Platforms/iOS/PrivacyInfo.xcprivacy b/CSharpMath.Uno.Example/Platforms/iOS/PrivacyInfo.xcprivacy
new file mode 100644
index 000000000..902abb059
--- /dev/null
+++ b/CSharpMath.Uno.Example/Platforms/iOS/PrivacyInfo.xcprivacy
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+ NSPrivacyAccessedAPIType
+ NSPrivacyAccessedAPICategoryFileTimestamp
+ NSPrivacyAccessedAPITypeReasons
+
+ C617.1
+
+
+
+ NSPrivacyAccessedAPIType
+ NSPrivacyAccessedAPICategorySystemBootTime
+ NSPrivacyAccessedAPITypeReasons
+
+ 35F9.1
+
+
+
+ NSPrivacyAccessedAPIType
+ NSPrivacyAccessedAPICategoryDiskSpace
+ NSPrivacyAccessedAPITypeReasons
+
+ E174.1
+
+
+
+
+
+ NSPrivacyAccessedAPIType
+ NSPrivacyAccessedAPICategoryUserDefaults
+ NSPrivacyAccessedAPITypeReasons
+
+ CA92.1
+
+
+
diff --git a/CSharpMath.Uno.Example/Properties/launchSettings.json b/CSharpMath.Uno.Example/Properties/launchSettings.json
new file mode 100644
index 000000000..54ac17864
--- /dev/null
+++ b/CSharpMath.Uno.Example/Properties/launchSettings.json
@@ -0,0 +1,46 @@
+{
+ "iisSettings": {
+ "windowsAuthentication": false,
+ "anonymousAuthentication": true,
+ "iisExpress": {
+ "applicationUrl": "http://localhost:8080",
+ "sslPort": 0
+ }
+ },
+ "profiles": {
+ // This profile is first in order for dotnet run to pick it up by default
+ "CSharpMath.Uno.Example (WebAssembly)": {
+ "commandName": "Project",
+ "dotnetRunMessages": true,
+ "launchBrowser": true,
+ "applicationUrl": "http://localhost:5000",
+ "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ }
+ },
+ "CSharpMath.Uno.Example (WebAssembly IIS Express)": {
+ "commandName": "IISExpress",
+ "launchBrowser": true,
+ "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ }
+ },
+ "CSharpMath.Uno.Example (Desktop)": {
+ "commandName": "Project",
+ "compatibleTargetFramework": "desktop"
+ },
+ "CSharpMath.Uno.Example (Desktop WSL2)": {
+ "commandName": "WSL2",
+ "commandLineArgs": "{ProjectDir}/bin/{Configuration}/{TargetFramework}/CSharpMath.Uno.Example.dll",
+ "distributionName": "",
+ "compatibleTargetFramework": "desktop"
+ },
+ "CSharpMath.Uno.Example (Windows)": {
+ "commandName": "MsixPackage",
+ "compatibleTargetFramework": "windows",
+ "nativeDebugging": false
+ }
+ }
+}
diff --git a/CSharpMath.Uno.Example/Strings/en/Resources.resw b/CSharpMath.Uno.Example/Strings/en/Resources.resw
new file mode 100644
index 000000000..476a4e2f6
--- /dev/null
+++ b/CSharpMath.Uno.Example/Strings/en/Resources.resw
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ CSharpMath.Uno.Example-en
+
+
diff --git a/CSharpMath.Uno.Example/app.manifest b/CSharpMath.Uno.Example/app.manifest
new file mode 100644
index 000000000..bd283f252
--- /dev/null
+++ b/CSharpMath.Uno.Example/app.manifest
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true/PM
+ PerMonitorV2, PerMonitor
+
+
+
diff --git a/CSharpMath.Uno/CSharpMath.Uno.csproj b/CSharpMath.Uno/CSharpMath.Uno.csproj
new file mode 100644
index 000000000..6ca33dd47
--- /dev/null
+++ b/CSharpMath.Uno/CSharpMath.Uno.csproj
@@ -0,0 +1,41 @@
+
+
+ net10.0;net10.0-android;net10.0-browserwasm;net10.0-desktop
+ $(TargetFrameworks);net10.0-ios
+ $(TargetFrameworks);net10.0-windows10.0.19041.0
+ The Uno/WinUI front end for CSharpMath.
+ $(PackageTags) uno
+ $(DefineConstants) Uno
+
+ Library
+ true
+
+ true
+
+ SkiaRenderer
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CSharpMath.Xaml/Views.cs b/CSharpMath.Xaml/Views.cs
index 5fa583de2..0bcf8608c 100644
--- a/CSharpMath.Xaml/Views.cs
+++ b/CSharpMath.Xaml/Views.cs
@@ -11,6 +11,7 @@
using XCanvas = CSharpMath.Avalonia.AvaloniaCanvas;
using XCanvasColor = Avalonia.Media.Color;
using XColor = Avalonia.Media.Color;
+using XThickness = Avalonia.Thickness;
using XInheritControl = Avalonia.Controls.Control;
using XProperty = Avalonia.AvaloniaProperty;
namespace CSharpMath.Avalonia {
@@ -19,10 +20,22 @@ namespace CSharpMath.Avalonia {
using XCanvas = (Microsoft.Maui.Graphics.ICanvas, Microsoft.Maui.Graphics.SizeF);
using XCanvasColor = Microsoft.Maui.Graphics.Color;
using XColor = Microsoft.Maui.Graphics.Color;
+using XThickness = Microsoft.Maui.Thickness;
using XInheritControl = Microsoft.Maui.Controls.GraphicsView;
using XProperty = Microsoft.Maui.Controls.BindableProperty;
namespace CSharpMath.Maui {
[Microsoft.Maui.Controls.ContentProperty(nameof(LaTeX))]
+#elif Uno
+using XCanvas = SkiaSharp.SKCanvas;
+using XCanvasColor = SkiaSharp.SKColor;
+using XColor = Windows.UI.Color;
+using XThickness = Microsoft.UI.Xaml.Thickness;
+using XInheritControl = SkiaSharp.Views.Windows.SKXamlCanvas;
+using XProperty = Microsoft.UI.Xaml.DependencyProperty;
+using MathPainter = CSharpMath.SkiaSharp.MathPainter;
+using TextPainter = CSharpMath.SkiaSharp.TextPainter;
+namespace CSharpMath.Uno {
+ [Microsoft.UI.Xaml.Markup.ContentProperty(Name = nameof(LaTeX))]
#endif
public class BaseView : XInheritControl, ICSharpMathAPI
where TPainter : Painter, new() where TContent : class {
@@ -33,7 +46,12 @@ public class BaseView : XInheritControl, ICSharpMathAPIContains all the properties to listen to for painter property changes. Do not mutate.
public static readonly XProperty[] WritablePainterProperties;
/// Contains all the property names to listen to for painter property changes. Do not mutate.
- public static readonly HashSet WritablePainterPropertyNames;
+#if Uno
+ private
+#else
+ public
+#endif
+ static readonly HashSet WritablePainterPropertyNames;
static BaseView() {
WritablePainterProperties = [
EnablePanningProperty = CreateProperty, bool>(nameof(EnablePanning), false, _ => false, (_, __) => { }),
@@ -50,7 +68,7 @@ static BaseView() {
HighlightColorProperty = CreateProperty, XColor>(nameof(HighlightColor), false, p => XCanvasColorToXColor(p.HighlightColor), (p, v) => p.HighlightColor = XColorToXCanvasColor(v)),
ErrorColorProperty = CreateProperty, XColor>(nameof(ErrorColor), false, p => XCanvasColorToXColor(p.ErrorColor), (p, v) => p.ErrorColor = XColorToXCanvasColor(v)),
TextAlignmentProperty = CreateProperty, TextAlignment>(nameof(Rendering.FrontEnd.TextAlignment), false, p => (TextAlignment)drawMethodParams[1].DefaultValue!, (p, v) => { }),
- PaddingProperty = CreateProperty, Thickness>(nameof(Padding), false, p => (Thickness)(drawMethodParams[2].DefaultValue ?? new Thickness()), (p, v) => { }),
+ PaddingProperty = CreateProperty, XThickness>(nameof(Padding), false, p => drawMethodParams[2].DefaultValue is Thickness t ? new XThickness(left: t.Left, top: t.Top, right: t.Right, bottom: t.Bottom) : new XThickness(), (p, v) => { }),
DisplacementXProperty = CreateProperty, float>(nameof(DisplacementX), false, p => (float)drawMethodParams[3].DefaultValue!, (p, v) => { }),
DisplacementYProperty = CreateProperty, float>(nameof(DisplacementY), false, p => (float)drawMethodParams[4].DefaultValue!, (p, v) => { }),
MagnificationProperty = CreateProperty, float>(nameof(Magnification), false, p => p.Magnification, (p, v) => p.Magnification = v),
@@ -60,32 +78,31 @@ static BaseView() {
WritablePainterPropertyNames = [.. WritablePainterProperties.Select(GetPropertyName)];
ErrorMessagePropertyKey = new ReadOnlyProperty, string?>(nameof(ErrorMessage), p => p.ErrorMessage);
ErrorMessageProperty = ErrorMessagePropertyKey.Property;
- }
-
- public static XProperty CreateProperty(
- string propertyName,
- bool affectsMeasure,
- Func defaultValueGet,
- Action propertySet,
- Action? updateOtherProperty = null)
- where TThis : BaseView {
- var defaultValue = defaultValueGet(staticPainter);
- void PropertyChanged(TThis @this, object? newValue) {
- // We need to support nullable classes and structs, so we cannot forbid null here
- // So this use of the null-forgiving operator should be blamed on non-generic PropertyChanged handlers
- var @new = (TValue)newValue!;
- propertySet(@this.Painter, @new);
- updateOtherProperty?.Invoke(@this, @new);
- if (affectsMeasure) @this.InvalidateMeasure();
- // Redraw immediately! No deferred drawing
+ static XProperty CreateProperty(
+ string propertyName,
+ bool affectsMeasure,
+ Func defaultValueGet,
+ Action propertySet,
+ Action? updateOtherProperty = null)
+ where TThis : BaseView {
+ var defaultValue = defaultValueGet(staticPainter);
+ void PropertyChanged(TThis @this, object? newValue) {
+ // We need to support nullable classes and structs, so we cannot forbid null here
+ // So this use of the null-forgiving operator should be blamed on non-generic PropertyChanged handlers
+ var @new = (TValue)newValue!;
+ propertySet(@this.Painter, @new);
+ updateOtherProperty?.Invoke(@this, @new);
+ if (affectsMeasure) @this.InvalidateMeasure();
+ // Redraw immediately! No deferred drawing
#if Avalonia
- @this.InvalidateVisual();
+ @this.InvalidateVisual();
+ }
+ var prop = XProperty.Register(propertyName, defaultValue);
+ global::Avalonia.AvaloniaObjectExtensions.AddClassHandler(prop.Changed, (t, e) => PropertyChanged(t, e.NewValue));
+ return prop;
}
- var prop = XProperty.Register(propertyName, defaultValue);
- global::Avalonia.AvaloniaObjectExtensions.AddClassHandler(prop.Changed, (t, e) => PropertyChanged(t, e.NewValue));
- return prop;
+ static string GetPropertyName(XProperty prop) => prop.Name;
}
- static string GetPropertyName(XProperty prop) => prop.Name;
public BaseView() {
// Respect built-in styles
Styles.Add(new global::Avalonia.Styling.Style(global::Avalonia.Styling.Selectors.Is>) {
@@ -99,14 +116,9 @@ public BaseView() {
Painter.Measure((float)availableSize.Width) is { } rect
? new global::Avalonia.Size(rect.Width, rect.Height)
: base.MeasureOverride(availableSize);
- struct ReadOnlyProperty where TThis : BaseView {
- public ReadOnlyProperty(string propertyName,
- Func getter) {
- Property = XProperty.RegisterDirect(propertyName, b => getter(b.Painter), null, getter(staticPainter));
- _value = getter(staticPainter);
- }
- TValue _value;
- public global::Avalonia.DirectProperty Property;
+ struct ReadOnlyProperty(string propertyName, Func getter) where TThis : BaseView {
+ TValue _value = getter(staticPainter);
+ public global::Avalonia.DirectProperty Property = XProperty.RegisterDirect(propertyName, b => getter(b.Painter), null, getter(staticPainter));
public void SetValue(TThis @this, TValue value) => @this.SetAndRaise(Property, ref _value, value);
}
static XCanvasColor XColorToXCanvasColor(XColor color) => color;
@@ -140,22 +152,19 @@ public override void Render(global::Avalonia.Media.DrawingContext context) {
base.Render(context);
var canvas = new XCanvas(context, Bounds.Size);
#elif Maui
- @this.Invalidate();
+ @this.Invalidate();
+ }
+ return XProperty.Create(propertyName, typeof(TValue), typeof(TThis), defaultValue,
+ propertyChanged: (b, o, n) => PropertyChanged((TThis)b, n));
}
- return XProperty.Create(propertyName, typeof(TValue), typeof(TThis), defaultValue,
- propertyChanged: (b, o, n) => PropertyChanged((TThis)b, n));
+ static string GetPropertyName(XProperty prop) => prop.PropertyName;
}
- static string GetPropertyName(XProperty prop) => prop.PropertyName;
protected override Microsoft.Maui.Graphics.Size MeasureOverride(double widthConstraint, double heightConstraint) =>
Painter.Measure((float)widthConstraint) is { } rect
? new(Math.Min(rect.Width, widthConstraint), Math.Min(rect.Height, heightConstraint)) // We can't allocate too big of a GraphicsView on MAUI Windows.
: base.MeasureOverride(widthConstraint, heightConstraint);
- struct ReadOnlyProperty where TThis : BaseView {
- public ReadOnlyProperty(string propertyName,
- Func getter) {
- _key = XProperty.CreateReadOnly(propertyName, typeof(TValue), typeof(TThis), getter(staticPainter));
- }
- readonly Microsoft.Maui.Controls.BindablePropertyKey _key;
+ readonly struct ReadOnlyProperty(string propertyName, Func getter) where TThis : BaseView {
+ readonly Microsoft.Maui.Controls.BindablePropertyKey _key = XProperty.CreateReadOnly(propertyName, typeof(TValue), typeof(TThis), getter(staticPainter));
public XProperty Property => _key.BindableProperty;
public void SetValue(TThis @this, TValue value) => @this.SetValue(_key, value);
}
@@ -180,14 +189,60 @@ public BaseView() {
Drawable = new DrawableRedirector(this);
}
class DrawableRedirector(BaseView parent) : Microsoft.Maui.Graphics.IDrawable {
-
+
public void Draw(XCanvas_Canvas canvas, Microsoft.Maui.Graphics.RectF dirtyRect) => parent.Draw(canvas);
}
void Draw(XCanvas_Canvas rawCanvas) {
// dirtyRect may be larger than Width and Height on Windows which leads to incorrect alignments
var canvas = (rawCanvas, new Microsoft.Maui.Graphics.SizeF((float)Width, (float)Height));
+#elif Uno
+ @this.Invalidate();
+ }
+ return XProperty.Register(propertyName, typeof(TValue), typeof(TThis),
+ new Microsoft.UI.Xaml.PropertyMetadata(defaultValue, (b, n) => PropertyChanged((TThis)b, n.NewValue)));
+ }
+ static string GetPropertyName(XProperty prop) => ""; // unsupported :(
+ }
+ public BaseView() {
+ PointerPressed += (sender, e) => {
+ if (e.GetCurrentPoint(this) is { Properties.IsLeftButtonPressed: true } point && EnablePanning)
+ _origin = point.Position;
+ };
+ PointerMoved += (sender, e) => {
+ if (e.GetCurrentPoint(this) is { Properties.IsLeftButtonPressed: true } point && EnablePanning) {
+ var displacement = new Windows.Foundation.Point(point.Position.X - _origin.X, point.Position.Y - _origin.Y);
+ _origin = point.Position;
+ DisplacementX += (float)displacement.X;
+ DisplacementY += (float)displacement.Y;
+ }
+ };
+ PointerReleased += (sender, e) => {
+ if (e.GetCurrentPoint(this) is { Properties.IsLeftButtonPressed: true } point && EnablePanning)
+ _origin = point.Position;
+ };
+ }
+ protected override Windows.Foundation.Size MeasureOverride(Windows.Foundation.Size availableSize) =>
+ Painter.Measure((float)availableSize.Width) is { } rect
+ ? new Windows.Foundation.Size(rect.Width, rect.Height)
+ : base.MeasureOverride(availableSize);
+ [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.AllConstructors)]
+ readonly struct ReadOnlyProperty(string propertyName, Func getter) where TThis : BaseView {
+ public readonly XProperty Property = XProperty.Register(propertyName, typeof(TValue), typeof(TThis), new Microsoft.UI.Xaml.PropertyMetadata(getter(staticPainter)));
+ public void SetValue(TThis @this, TValue value) => @this.SetValue(Property, value);
+ }
+ static XCanvasColor XColorToXCanvasColor(XColor color) => new(color.R, color.G, color.B, color.A);
+ static XColor XCanvasColorToXColor(XCanvasColor color) => XColor.FromArgb(color.Alpha, color.Red, color.Green, color.Blue);
+ Windows.Foundation.Point _origin;
+ protected override void OnPaintSurface(global::SkiaSharp.Views.Windows.SKPaintSurfaceEventArgs e) {
+ base.OnPaintSurface(e);
+ var canvas = e.Surface.Canvas;
+ canvas.Clear();
+ // SkiaSharp deals with raw pixels as opposed to Uno's device-independent units.
+ // We should scale to occupy the full view size.
+ canvas.Scale(e.Info.Width / (float)ActualWidth);
#endif
- Painter.Draw(canvas, TextAlignment, Padding, DisplacementX, DisplacementY);
+ var padding = Padding;
+ Painter.Draw(canvas, TextAlignment, new(left: (float)padding.Left, top: (float)padding.Top, right: (float)padding.Right, bottom: (float)padding.Bottom), DisplacementX, DisplacementY);
}
/// Requires touch events to be enabled in SkiaSharp/Xamarin.Forms
public bool EnablePanning { get => (bool)GetValue(EnablePanningProperty)!; set => SetValue(EnablePanningProperty, value); }
@@ -195,7 +250,7 @@ void Draw(XCanvas_Canvas rawCanvas) {
static readonly System.Reflection.ParameterInfo[] drawMethodParams = typeof(TPainter)
.GetMethod(nameof(Painter.Draw),
- new[] { typeof(XCanvas), typeof(TextAlignment), typeof(Thickness), typeof(float), typeof(float) })!.GetParameters();
+ [typeof(XCanvas), typeof(TextAlignment), typeof(Thickness), typeof(float), typeof(float)])!.GetParameters();
static T? Nullable(T value) where T : struct => new T?(value);
public (XColor glyph, XColor textRun)? GlyphBoxColor { get => ((XColor glyph, XColor textRun)?)GetValue(GlyphBoxColorProperty); set => SetValue(GlyphBoxColorProperty, value); }
public static readonly XProperty GlyphBoxColorProperty;
@@ -224,7 +279,7 @@ void Draw(XCanvas_Canvas rawCanvas) {
public static readonly XProperty ErrorColorProperty;
public TextAlignment TextAlignment { get => (TextAlignment)GetValue(TextAlignmentProperty)!; set => SetValue(TextAlignmentProperty, value); }
public static readonly XProperty TextAlignmentProperty;
- public Thickness Padding { get => (Thickness)GetValue(PaddingProperty)!; set => SetValue(PaddingProperty, value); }
+ public XThickness Padding { get => (XThickness)GetValue(PaddingProperty)!; set => SetValue(PaddingProperty, value); }
public static readonly XProperty PaddingProperty;
public float DisplacementX { get => (float)GetValue(DisplacementXProperty)!; set => SetValue(DisplacementXProperty, value); }
public static readonly XProperty DisplacementXProperty;
diff --git a/CSharpMath.sln b/CSharpMath.sln
index a6574cdf9..089a635c5 100644
--- a/CSharpMath.sln
+++ b/CSharpMath.sln
@@ -1,3 +1,4 @@
+
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 18
VisualStudioVersion = 18.0.11222.15
@@ -80,6 +81,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpMath.VectSharp", "CSh
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpMath.VectSharp.Example", "CSharpMath.VectSharp.Example\CSharpMath.VectSharp.Example.csproj", "{918002F5-A5C8-4075-B550-DF7A275A287E}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Uno", "Uno", "{D51AF8DB-2CD7-48B4-8E80-726284EDABD2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpMath.Uno", "CSharpMath.Uno\CSharpMath.Uno.csproj", "{3C188842-3F04-4DF6-9841-9E1E8B70E71E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpMath.Uno.Example", "CSharpMath.Uno.Example\CSharpMath.Uno.Example.csproj", "{B9FDDC42-A1DC-0A86-7868-350F0FEF376D}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -1069,6 +1076,103 @@ Global
{918002F5-A5C8-4075-B550-DF7A275A287E}.Release|x64.Build.0 = Release|Any CPU
{918002F5-A5C8-4075-B550-DF7A275A287E}.Release|x86.ActiveCfg = Release|Any CPU
{918002F5-A5C8-4075-B550-DF7A275A287E}.Release|x86.Build.0 = Release|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.AppStore|ARM.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.AppStore|iPhone.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.AppStore|x64.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.AppStore|x64.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.AppStore|x86.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.AppStore|x86.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Debug|ARM.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Debug|x64.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Debug|x86.Build.0 = Debug|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Release|ARM.ActiveCfg = Release|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Release|ARM.Build.0 = Release|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Release|iPhone.Build.0 = Release|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Release|x64.ActiveCfg = Release|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Release|x64.Build.0 = Release|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Release|x86.ActiveCfg = Release|Any CPU
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E}.Release|x86.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.AppStore|Any CPU.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.AppStore|ARM.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.AppStore|ARM.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.AppStore|iPhone.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.AppStore|x64.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.AppStore|x64.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.AppStore|x86.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.AppStore|x86.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Debug|ARM.Build.0 = Debug|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Debug|x64.Build.0 = Debug|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Debug|x86.Build.0 = Debug|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Release|ARM.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Release|ARM.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Release|iPhone.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Release|x64.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Release|x64.Build.0 = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Release|x86.ActiveCfg = Release|Any CPU
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1096,6 +1200,8 @@ Global
{9B79D7A1-856D-44E2-8C93-9BFA30FCFDB6} = {125C1FE9-F684-4E87-A9EF-969FD1E2D726}
{A7860E80-776F-68F0-77C5-838F918432F9} = {7CD7AA0E-4AE7-4089-9177-C940E5D26784}
{918002F5-A5C8-4075-B550-DF7A275A287E} = {7CD7AA0E-4AE7-4089-9177-C940E5D26784}
+ {3C188842-3F04-4DF6-9841-9E1E8B70E71E} = {D51AF8DB-2CD7-48B4-8E80-726284EDABD2}
+ {B9FDDC42-A1DC-0A86-7868-350F0FEF376D} = {D51AF8DB-2CD7-48B4-8E80-726284EDABD2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3C9A56A6-4EA3-4228-B064-E4789B282032}
diff --git a/Directory.Build.props b/Directory.Build.props
index 8db6004ae..f988a850e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -10,8 +10,7 @@
-
-
+
11.3.9
@@ -89,7 +88,7 @@
-
+