diff --git a/CSharpMath.Rendering/FrontEnd/ICSharpMathAPI.cs b/CSharpMath.Rendering/FrontEnd/ICSharpMathAPI.cs index 72305b7c..c5dba9c1 100644 --- a/CSharpMath.Rendering/FrontEnd/ICSharpMathAPI.cs +++ b/CSharpMath.Rendering/FrontEnd/ICSharpMathAPI.cs @@ -9,15 +9,15 @@ public interface ICSharpMathAPI where TContent : class { TColor TextColor { get; set; } TColor ErrorColor { get; set; } ///Unit of measure: points; Defaults to . - float? ErrorFontSize { get; set; } + double? ErrorFontSize { get; set; } bool DisplayErrorInline { get; set; } PaintStyle PaintStyle { get; set; } - float Magnification { get; set; } + double Magnification { get; set; } string? ErrorMessage { get; } #endregion Non-display-recreating properties #region Display-recreating properties /// Unit of measure: points - float FontSize { get; set; } + double FontSize { get; set; } System.Collections.Generic.IEnumerable LocalTypefaces { get; set; } Atom.LineStyle LineStyle { get; set; } TContent? Content { get; set; } diff --git a/CSharpMath.Rendering/FrontEnd/MathPainter.cs b/CSharpMath.Rendering/FrontEnd/MathPainter.cs index 40541467..0b2c1f0c 100644 --- a/CSharpMath.Rendering/FrontEnd/MathPainter.cs +++ b/CSharpMath.Rendering/FrontEnd/MathPainter.cs @@ -25,7 +25,7 @@ protected override void UpdateDisplayCore(float unused) { public override void Draw(TCanvas canvas, TextAlignment alignment = TextAlignment.Center, Thickness padding = default, float offsetX = 0, float offsetY = 0) { var c = WrapCanvas(canvas); UpdateDisplay(float.NaN); - DrawCore(c, Display, Display == null ? new PointF?() : IPainterExtensions.GetDisplayPosition(Display.Width, Display.Ascent, Display.Descent, FontSize, c.Width, c.Height, alignment, padding, offsetX, offsetY)); + DrawCore(c, Display, Display == null ? new PointF?() : IPainterExtensions.GetDisplayPosition(Display.Width, Display.Ascent, Display.Descent, (float)FontSize, c.Width, c.Height, alignment, padding, offsetX, offsetY)); } public void Draw(TCanvas canvas, float x, float y) { var c = WrapCanvas(canvas); diff --git a/CSharpMath.Rendering/FrontEnd/Painter.cs b/CSharpMath.Rendering/FrontEnd/Painter.cs index d5b59083..7d86cbe4 100644 --- a/CSharpMath.Rendering/FrontEnd/Painter.cs +++ b/CSharpMath.Rendering/FrontEnd/Painter.cs @@ -30,14 +30,14 @@ public Painter() { /// Unit of measure: points; /// Defaults to . /// - public float? ErrorFontSize { get; set; } + public double? ErrorFontSize { get; set; } public bool DisplayErrorInline { get; set; } = true; public TColor ErrorColor { get; set; } public TColor TextColor { get; set; } public TColor HighlightColor { get; set; } public (TColor glyph, TColor textRun)? GlyphBoxColor { get; set; } public PaintStyle PaintStyle { get; set; } = PaintStyle.Fill; - public float Magnification { get; set; } = 1; + public double Magnification { get; set; } = 1; public string? ErrorMessage { get; protected set; } public abstract IDisplay? Display { get; protected set; } #endregion Non-redisplaying properties @@ -47,9 +47,9 @@ public Painter() { protected abstract void SetRedisplay(); protected Fonts Fonts { get; private set; } = new Fonts(Array.Empty(), DefaultFontSize); /// Unit of measure: points - public float FontSize { get => Fonts.PointSize; set { Fonts = new Fonts(Fonts, value); SetRedisplay(); } } + public double FontSize { get => Fonts.PointSize; set { Fonts = new Fonts(Fonts, (float)value); SetRedisplay(); } } IEnumerable __localTypefaces = Array.Empty(); - public IEnumerable LocalTypefaces { get => __localTypefaces; set { Fonts = new Fonts(value, FontSize); __localTypefaces = value; SetRedisplay(); } } + public IEnumerable LocalTypefaces { get => __localTypefaces; set { Fonts = new Fonts(value, (float)FontSize); __localTypefaces = value; SetRedisplay(); } } Atom.LineStyle __style = Atom.LineStyle.Display; public Atom.LineStyle LineStyle { get => __style; set { __style = value; SetRedisplay(); } } TContent? __content; @@ -74,7 +74,7 @@ protected void UpdateDisplay(float textPainterCanvasWidth) { UpdateDisplayCore(textPainterCanvasWidth); if (Display == null && DisplayErrorInline && ErrorMessage != null) { var font = Fonts; - if (ErrorFontSize is { } errorSize) font = new Fonts(font, errorSize); + if (ErrorFontSize is { } errorSize) font = new Fonts(font, (float)errorSize); var errorLines = ErrorMessage.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); var runs = new List>(); float y = 0; @@ -116,7 +116,7 @@ protected void DrawCore(ICanvas canvas, IDisplay? display, PointF? canvas.Save(); //invert the canvas vertically: displays are drawn with mathematical coordinates, not graphical coordinates canvas.Scale(1, -1); - canvas.Scale(Magnification, Magnification); + canvas.Scale((float)Magnification, (float)Magnification); if (position is { } p) display.Position = new PointF(p.X, p.Y); canvas.DefaultColor = WrapColor(TextColor); canvas.CurrentColor = WrapColor(HighlightColor); diff --git a/CSharpMath.Rendering/FrontEnd/TextPainter.cs b/CSharpMath.Rendering/FrontEnd/TextPainter.cs index 862a51ca..82d763a1 100644 --- a/CSharpMath.Rendering/FrontEnd/TextPainter.cs +++ b/CSharpMath.Rendering/FrontEnd/TextPainter.cs @@ -56,7 +56,7 @@ private void DrawCore(TCanvas canvas, float? width, TextAlignment alignment, System.Math.Max(_relativeXCoordDisplay.Width, _absoluteXCoordDisplay.Width), System.Math.Max(_relativeXCoordDisplay.Ascent, _absoluteXCoordDisplay.Ascent), System.Math.Max(_relativeXCoordDisplay.Descent, _absoluteXCoordDisplay.Descent), - FontSize, width ?? c.Width, + (float)FontSize, width ?? c.Width, c.Height, alignment, padding, offsetX, offsetY )); var adjustedCanvasWidth = diff --git a/CSharpMath.SkiaSharp.Wasm/CSharpMath.SkiaSharp.Wasm.csproj b/CSharpMath.SkiaSharp.Wasm/CSharpMath.SkiaSharp.Wasm.csproj deleted file mode 100644 index 843cb486..00000000 --- a/CSharpMath.SkiaSharp.Wasm/CSharpMath.SkiaSharp.Wasm.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - netstandard2.0 - The SkiaSharp front end for CSharpMath on WebAssembly. - $(PackageTags) skiasharp - - - - - - - - - - - - - - - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Assets/AboutAssets.txt b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Assets/AboutAssets.txt deleted file mode 100644 index ee398862..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Assets/AboutAssets.txt +++ /dev/null @@ -1,19 +0,0 @@ -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 you 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"); \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Assets/Fonts/winjs-symbols.ttf b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Assets/Fonts/winjs-symbols.ttf deleted file mode 100644 index 118f5c48..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Assets/Fonts/winjs-symbols.ttf and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/CSharpMath.Uno.Example.Droid.csproj b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/CSharpMath.Uno.Example.Droid.csproj deleted file mode 100644 index ca1b39c5..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/CSharpMath.Uno.Example.Droid.csproj +++ /dev/null @@ -1,114 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - CSharpMath.Uno.Example.Droid - CSharpMath.Uno.Example.Droid - 512 - true - Resources\Resource.Designer.cs - - false - Off - False - v9.0 - Properties\AndroidManifest.xml - True - ..\CSharpMath.Uno.Example.Shared\Strings - - - true - portable - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - True - None - - - portable - true - true - true - bin\Release\ - TRACE - prompt - 4 - False - SdkOnly - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {65016a61-2125-4e0c-90e8-a915230c7826} - CSharpMath.Rendering - - - {35b4bb5b-2202-436e-9afe-00997ca2cc65} - CSharpMath.SkiaSharp - - - {cbfa75c9-5b10-4df9-bc52-1559f9a664d5} - CSharpMath.Uno - - - {5157367b-f03e-4acb-83a1-0de414a3bfca} - CSharpMath - - - - - - - \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Main.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Main.cs deleted file mode 100644 index 233710e2..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Main.cs +++ /dev/null @@ -1,43 +0,0 @@ -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 Com.Nostra13.Universalimageloader.Core; -using Windows.UI.Xaml.Media; - -namespace CSharpMath.Uno.Example.Droid -{ - [global::Android.App.ApplicationAttribute( - Label = "@string/ApplicationName", - LargeHeap = true, - HardwareAccelerated = true, - Theme = "@style/AppTheme" - )] - public class Application : Windows.UI.Xaml.NativeApplication - { - public Application(IntPtr javaReference, JniHandleOwnership transfer) - : base(() => new App(), javaReference, transfer) - { - ConfigureUniversalImageLoader(); - } - - private void ConfigureUniversalImageLoader() - { - // Create global configuration and initialize ImageLoader with this config - ImageLoaderConfiguration config = new ImageLoaderConfiguration - .Builder(Context) - .Build(); - - ImageLoader.Instance.Init(config); - - ImageSource.DefaultImageLoader = ImageLoader.Instance.LoadImageAsync; - } - } -} diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/MainActivity.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/MainActivity.cs deleted file mode 100644 index c8de211f..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/MainActivity.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Android.App; -using Android.Widget; -using Android.OS; -using Android.Content.PM; -using Android.Views; - -namespace CSharpMath.Uno.Example.Droid -{ - [Activity( - MainLauncher = true, - ConfigurationChanges = global::Uno.UI.ActivityHelper.AllConfigChanges, - WindowSoftInputMode = SoftInput.AdjustPan | SoftInput.StateHidden - )] - public class MainActivity : Windows.UI.Xaml.ApplicationActivity - { - } -} - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Properties/AndroidManifest.xml b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Properties/AndroidManifest.xml deleted file mode 100644 index b2baa2b4..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Properties/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Properties/AssemblyInfo.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Properties/AssemblyInfo.cs deleted file mode 100644 index 20a84776..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Android.App; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CSharpMath.Uno.Example.Droid")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CSharpMath.Uno.Example.Droid")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Resources/AboutResources.txt b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Resources/AboutResources.txt deleted file mode 100644 index c2bca974..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Resources/AboutResources.txt +++ /dev/null @@ -1,44 +0,0 @@ -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. \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Resources/drawable/Icon.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Resources/drawable/Icon.png deleted file mode 100644 index 8074c4c5..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Resources/drawable/Icon.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Resources/values/Strings.xml b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Resources/values/Strings.xml deleted file mode 100644 index ed180a91..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Resources/values/Strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - Hello World, Click Me! - CSharpMath.Uno.Example - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Resources/values/Styles.xml b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Resources/values/Styles.xml deleted file mode 100644 index d668a8e0..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Droid/Resources/values/Styles.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/App.xaml b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/App.xaml deleted file mode 100644 index fc78e5fd..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/App.xaml +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/App.xaml.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/App.xaml.cs deleted file mode 100644 index b314e532..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/App.xaml.cs +++ /dev/null @@ -1,163 +0,0 @@ -using Microsoft.Extensions.Logging; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.ApplicationModel; -using Windows.ApplicationModel.Activation; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; - -namespace CSharpMath.Uno.Example -{ - /// - /// Provides application-specific behavior to supplement the default Application class. - /// - sealed 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() - { - ConfigureFilters(global::Uno.Extensions.LogExtensionPoint.AmbientLoggerFactory); - - this.InitializeComponent(); - this.Suspending += OnSuspending; - } - - /// - /// Invoked when the application is launched normally by the end user. Other entry points - /// will be used such as when the application is launched to open a specific file. - /// - /// Details about the launch request and process. - protected override void OnLaunched(LaunchActivatedEventArgs e) - { -#if DEBUG - if (System.Diagnostics.Debugger.IsAttached) - { - // this.DebugSettings.EnableFrameRateCounter = true; - } -#endif - Frame rootFrame = Windows.UI.Xaml.Window.Current.Content as Frame; - - // Do not repeat app initialization when the Window already has content, - // just ensure that the window is active - if (rootFrame == null) - { - // Create a Frame to act as the navigation context and navigate to the first page - rootFrame = new Frame(); - - rootFrame.NavigationFailed += OnNavigationFailed; - - if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) - { - //TODO: Load state from previously suspended application - } - - // Place the frame in the current Window - Windows.UI.Xaml.Window.Current.Content = rootFrame; - } - - if (e.PrelaunchActivated == false) - { - 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), e.Arguments); - } - // Ensure the current window is active - Windows.UI.Xaml.Window.Current.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 Exception($"Failed to load {e.SourcePageType.FullName}: {e.Exception}"); - } - - /// - /// Invoked when application execution is being suspended. Application state is saved - /// without knowing whether the application will be terminated or resumed with the contents - /// of memory still intact. - /// - /// The source of the suspend request. - /// Details about the suspend request. - private void OnSuspending(object sender, SuspendingEventArgs e) - { - var deferral = e.SuspendingOperation.GetDeferral(); - //TODO: Save application state and stop any background activity - deferral.Complete(); - } - - - /// - /// Configures global logging - /// - /// - static void ConfigureFilters(ILoggerFactory factory) - { - factory - .WithFilter(new FilterLoggerSettings - { - { "Uno", LogLevel.Warning }, - { "Windows", LogLevel.Warning }, - - // Debug JS interop - // { "Uno.Foundation.WebAssemblyRuntime", LogLevel.Debug }, - - // Generic Xaml events - // { "Windows.UI.Xaml", LogLevel.Debug }, - // { "Windows.UI.Xaml.VisualStateGroup", LogLevel.Debug }, - // { "Windows.UI.Xaml.StateTriggerBase", LogLevel.Debug }, - // { "Windows.UI.Xaml.UIElement", LogLevel.Debug }, - - // Layouter specific messages - // { "Windows.UI.Xaml.Controls", LogLevel.Debug }, - // { "Windows.UI.Xaml.Controls.Layouter", LogLevel.Debug }, - // { "Windows.UI.Xaml.Controls.Panel", LogLevel.Debug }, - // { "Windows.Storage", LogLevel.Debug }, - - // Binding related messages - // { "Windows.UI.Xaml.Data", LogLevel.Debug }, - - // DependencyObject memory references tracking - // { "ReferenceHolder", LogLevel.Debug }, - - // ListView-related messages - // { "Windows.UI.Xaml.Controls.ListViewBase", LogLevel.Debug }, - // { "Windows.UI.Xaml.Controls.ListView", LogLevel.Debug }, - // { "Windows.UI.Xaml.Controls.GridView", LogLevel.Debug }, - // { "Windows.UI.Xaml.Controls.VirtualizingPanelLayout", LogLevel.Debug }, - // { "Windows.UI.Xaml.Controls.NativeListViewBase", LogLevel.Debug }, - // { "Windows.UI.Xaml.Controls.ListViewBaseSource", LogLevel.Debug }, //iOS - // { "Windows.UI.Xaml.Controls.ListViewBaseInternalContainer", LogLevel.Debug }, //iOS - // { "Windows.UI.Xaml.Controls.NativeListViewBaseAdapter", LogLevel.Debug }, //Android - // { "Windows.UI.Xaml.Controls.BufferViewCache", LogLevel.Debug }, //Android - // { "Windows.UI.Xaml.Controls.VirtualizingPanelGenerator", LogLevel.Debug }, //WASM - } - ) -#if DEBUG - .AddConsole(LogLevel.Debug); -#else - .AddConsole(LogLevel.Information); -#endif - } - } -} diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/Assets/SharedAssets.md b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/Assets/SharedAssets.md deleted file mode 100644 index 8d2d37a1..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/Assets/SharedAssets.md +++ /dev/null @@ -1,34 +0,0 @@ -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 - -``` -\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 | UWP | 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/CSharpMath.Uno.Example.Shared/CSharpMath.Uno.Example.Shared.projitems b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/CSharpMath.Uno.Example.Shared.projitems deleted file mode 100644 index 3361c086..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/CSharpMath.Uno.Example.Shared.projitems +++ /dev/null @@ -1,66 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 6279c845-92f8-4333-ab99-3d213163593c - - - CSharpMath.Uno.Example.Shared - - - - Designer - MSBuild:Compile - - - - - App.xaml - - - ClockPage.xaml - - - MainPage.xaml - - - - MoreExamplesPage.xaml - - - TextPage.xaml - - - TryPage.xaml - - - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - - - - - - - \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/CSharpMath.Uno.Example.Shared.shproj b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/CSharpMath.Uno.Example.Shared.shproj deleted file mode 100644 index 4a4a9c77..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/CSharpMath.Uno.Example.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 6279c845-92f8-4333-ab99-3d213163593c - 14.0 - - - - - - - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/ClockPage.xaml b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/ClockPage.xaml deleted file mode 100644 index 8abcc606..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/ClockPage.xaml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/ClockPage.xaml.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/ClockPage.xaml.cs deleted file mode 100644 index 39a6528d..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/ClockPage.xaml.cs +++ /dev/null @@ -1,126 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using CSharpMath.SkiaSharp; -using SkiaSharp; -using SkiaSharp.Views.UWP; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; -using static System.Math; - -namespace CSharpMath.Uno.Example.Shared { - 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); - canvas.Scale(e.Info.Width / 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 Structures.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(); - } - } -} diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MainPage.xaml b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MainPage.xaml deleted file mode 100644 index 1910ac21..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MainPage.xaml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MainPage.xaml.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MainPage.xaml.cs deleted file mode 100644 index b79a0d47..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MainPage.xaml.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using CSharpMath.SkiaSharp; -using SkiaSharp; -using SkiaSharp.Views.UWP; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; -using static System.Math; - -// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409 - -namespace CSharpMath.Uno.Example { - /// - /// An empty page that can be used on its own or navigated to within a Frame. - /// - public sealed partial class MainPage : Page { - public MainPage() { - this.InitializeComponent(); - } - } -} diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MoreExamples.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MoreExamples.cs deleted file mode 100644 index 7de7cc60..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MoreExamples.cs +++ /dev/null @@ -1,492 +0,0 @@ -//Do not modify this file directly. Instead, modify this at -//CSharpMath\CSharpMath.Playground\iosMathDemo\ToFormsMoreExamples.cs and re-generate -//this file by executing the method in that file in the CSharpMath.Utils project. - -using CSharpMath.Atom; -using CSharpMath.Rendering.FrontEnd; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using Windows.UI; -using Windows.UI.Xaml.Media; -using Color = Windows.UI.Color; - -namespace CSharpMath.Uno.Example { - [System.Diagnostics.DebuggerNonUserCode, System.Runtime.CompilerServices.CompilerGenerated] - public static class MoreExamples { - public static ReadOnlyCollection Views { get; } - static MoreExamples() { - var demoLabels = new Dictionary(); - var labels = new Dictionary(); - - // Demo formulae - - // Quadratic formula - demoLabels[0] = new MathView { - LaTeX = @"\text{ваш вопрос: }x = \frac{-b \pm \sqrt{b^2-4ac}}{2a}", - Height = 112.5, - FontSize = 22.5f - }; - demoLabels[0].FontSize = 15; - - // This is first label so set the height from the top - demoLabels[1] = new MathView { - LaTeX = @"\color{#ff3399}{(a_1+a_2)^2}=a_1^2+2a_1a_2+a_2^2", - Height = 75, - FontSize = 22.5f - }; - demoLabels[2] = new MathView { - LaTeX = @"\cos(\theta + \varphi) = - \cos(\theta)\cos(\varphi) - \sin(\theta)\sin(\varphi)", - Height = 75, - FontSize = 22.5f - }; - demoLabels[3] = new MathView { - LaTeX = @"\frac{1}{\left(\sqrt{\phi \sqrt{5}}-\phi\right) e^{\frac25 \pi}} - = 1+\frac{e^{-2\pi}} {1 +\frac{e^{-4\pi}} {1+\frac{e^{-6\pi}} {1+\frac{e^{-8\pi}} {1+\cdots} } } }", - Height = 150, - FontSize = 22.5f - }; - demoLabels[4] = new MathView { - LaTeX = @"\sigma = \sqrt{\frac{1}{N}\sum_{i=1}^N (x_i - \mu)^2}", - Height = 112.5, - FontSize = 22.5f - }; - demoLabels[5] = new MathView { - LaTeX = @"\neg(P\land Q) \iff (\neg P)\lor(\neg Q)", - Height = 75, - FontSize = 22.5f - }; - demoLabels[6] = new MathView { - LaTeX = @"\log_b(x) = \frac{\log_a(x)}{\log_a(b)}", - Height = 75, - FontSize = 22.5f - }; - demoLabels[7] = new MathView { - LaTeX = @"\lim_{x\to\infty}\left(1 + \frac{k}{x}\right)^x = e^k", - Height = 75, - FontSize = 22.5f - }; - demoLabels[8] = new MathView { - LaTeX = @"\int_{-\infty}^\infty \! e^{-x^2} dx = \sqrt{\pi}", - Height = 75, - FontSize = 22.5f - }; - demoLabels[9] = new MathView { - LaTeX = @"\frac 1 n \sum_{i=1}^{n}x_i \geq \sqrt[n]{\prod_{i=1}^{n}x_i}", - Height = 112.5, - FontSize = 22.5f - }; - demoLabels[10] = new MathView { - LaTeX = @"f^{(n)}(z_0) = \frac{n!}{2\pi i}\oint_\gamma\frac{f(z)}{(z-z_0)^{n+1}}\,dz", - Height = 75, - FontSize = 22.5f - }; - demoLabels[11] = new MathView { - LaTeX = @"i\hbar\frac{\partial}{\partial t}\mathbf\Psi(\mathbf{x},t) = - -\frac{\hbar}{2m}\nabla^2\mathbf\Psi(\mathbf{x},t) + - V(\mathbf{x})\mathbf\Psi(\mathbf{x},t)", - Height = 75, - FontSize = 22.5f - }; - demoLabels[12] = new MathView { - LaTeX = @"\left(\sum_{k=1}^n a_k b_k \right)^2 \le \left(\sum_{k=1}^n a_k^2\right)\left(\sum_{k=1}^n b_k^2\right)", - Height = 112.5, - FontSize = 22.5f - }; - demoLabels[13] = new MathView { - LaTeX = @"{n \brace k} = \frac{1}{k!}\sum_{j=0}^k (-1)^{k-j}\binom{k}{j}(k-j)^n", - Height = 112.5, - FontSize = 22.5f - }; - demoLabels[14] = new MathView { - LaTeX = @"f(x) = \int\limits_{-\infty}^\infty\!\hat f(\xi)\,e^{2 \pi i \xi x}\,\mathrm{d}\xi", - Height = 112.5, - FontSize = 22.5f - }; - demoLabels[15] = new MathView { - LaTeX = @"\begin{gather} - \dot{x} = \sigma(y-x) \\ - \dot{y} = \rho x - y - xz \\ - \dot{z} = -\beta z + xy - \end{gather}", - Height = 131.25, - FontSize = 22.5f - }; - demoLabels[16] = new MathView { - LaTeX = @"\vec \bf V_1 \times \vec \bf V_2 = \begin{vmatrix} - \hat \imath &\hat \jmath &\hat k \\ - \frac{\partial X}{\partial u} & \frac{\partial Y}{\partial u} & 0 \\ - \frac{\partial X}{\partial v} & \frac{\partial Y}{\partial v} & 0 - \end{vmatrix}", - Height = 131.25, - FontSize = 22.5f - }; - demoLabels[17] = new MathView { - LaTeX = @"\begin{eqalign} - \nabla \cdot \vec{\bf{E}} & = \frac {\rho} {\varepsilon_0} \\ - \nabla \cdot \vec{\bf{B}} & = 0 \\ - \nabla \times \vec{\bf{E}} &= - \frac{\partial\vec{\bf{B}}}{\partial t} \\ - \nabla \times \vec{\bf{B}} & = \mu_0\vec{\bf{J}} + \mu_0\varepsilon_0 \frac{\partial\vec{\bf{E}}}{\partial t} - \end{eqalign}", - Height = 262.5, - FontSize = 22.5f - }; - demoLabels[18] = new MathView { - LaTeX = @"\begin{pmatrix} - a & b\\ c & d - \end{pmatrix} - \begin{pmatrix} - \alpha & \beta \\ \gamma & \delta - \end{pmatrix} = - \begin{pmatrix} - a\alpha + b\gamma & a\beta + b \delta \\ - c\alpha + d\gamma & c\beta + d \delta - \end{pmatrix}", - Height = 112.5, - FontSize = 22.5f - }; - demoLabels[19] = new MathView { - LaTeX = @"\frak Q(\lambda,\hat{\lambda}) = - -\frac{1}{2} \mathbb P(O \mid \lambda ) \sum_s \sum_m \sum_t \gamma_m^{(s)} (t) +\\ - \quad \left( \log(2 \pi ) + \log \left| \cal C_m^{(s)} \right| + - \left( o_t - \hat{\mu}_m^{(s)} \right) ^T \cal C_m^{(s)-1} \right)", - Height = 168.75, - FontSize = 22.5f - }; - demoLabels[20] = new MathView { - LaTeX = @"f(x) = \begin{cases} - \frac{e^x}{2} & x \geq 0 \\ - 1 & x < 0 - \end{cases}", - Height = 112.5, - FontSize = 22.5f - }; - demoLabels[21] = new MathView { - LaTeX = @"\color{#ff3333}{c}\color{#9933ff}{o}\color{#ff0080}{l}+\color{#99ff33}{\frac{\color{#ff99ff}{o}}{\color{#990099}{r}}}-\color{#33ffff}{\sqrt[\color{#3399ff}{e}]{\color{#3333ff}{d}}}", - Height = 112.5, - FontSize = 22.5f - }; - - // Test formulae - labels[0] = new MathView { - LaTeX = @"3+2-5 = 0", - Height = 75, - FontSize = 22.5f - }; - labels[0].Background = new SolidColorBrush(Colors.Red); - - // Infix and prefix Operators - labels[1] = new MathView { - LaTeX = @"12+-3 > +14", - Height = 75, - FontSize = 22.5f - }; - labels[1].Background = new SolidColorBrush(Colors.Red); - labels[1].TextAlignment = TextAlignment.Center; - - // Punct, parens - labels[2] = new MathView { - LaTeX = @"(-3-5=-8, -6-7=-13)", - Height = 75, - FontSize = 22.5f - }; - - // Latex commands - labels[3] = new MathView { - LaTeX = @"5\times(-2 \div 1) = -10", - Height = 75, - FontSize = 22.5f - }; - labels[3].Background = new SolidColorBrush(Colors.Red); - labels[3].TextAlignment = TextAlignment.Right; - labels[4] = new MathView { - LaTeX = @"-h - (5xy+2) = z", - Height = 75, - FontSize = 22.5f - }; - - // Text mode fraction - labels[5] = new MathView { - LaTeX = @"\frac12x + \frac{3\div4}2y = 25", - Height = 112.5, - FontSize = 22.5f - }; - labels[5].LineStyle = LineStyle.Text; - - // Display mode fraction - labels[6] = new MathView { - LaTeX = @"\frac{x+\frac{12}{5}}{y}+\frac1z = \frac{xz+y+\frac{12}{5}z}{yz}", - Height = 112.5, - FontSize = 22.5f - }; - labels[6].Background = new SolidColorBrush(Colors.Red); - - // fraction in fraction in text mode - labels[7] = new MathView { - LaTeX = @"\frac{x+\frac{12}{5}}{y}+\frac1z = \frac{xz+y+\frac{12}{5}z}{yz}", - Height = 112.5, - FontSize = 22.5f - }; - labels[7].Background = new SolidColorBrush(Colors.Red); - labels[7].LineStyle = LineStyle.Text; - - // Exponents and subscripts - - // Large font - labels[8] = new MathView { - LaTeX = @"\frac{x^{2+3y}}{x^{2+4y}} = x^y \times \frac{z_1^{y+1}}{z_1^{y+1}}", - Height = 168.75, - FontSize = 22.5f - }; - labels[8].FontSize = 30; - labels[8].TextAlignment = TextAlignment.Center; - - // Small font - labels[9] = new MathView { - LaTeX = @"\frac{x^{2+3y}}{x^{2+4y}} = x^y \times \frac{z_1^{y+1}}{z_1^{y+1}}", - Height = 56.25, - FontSize = 22.5f - }; - labels[9].FontSize = 10; - labels[9].TextAlignment = TextAlignment.Center; - - // Square root - labels[10] = new MathView { - LaTeX = @"5+\sqrt{2}+3", - Height = 75, - FontSize = 22.5f - }; - - // Square root inside square roots and with fractions - labels[11] = new MathView { - LaTeX = @"\sqrt{\frac{\sqrt{\frac{1}{2}} + 3}{\sqrt5^x}}+\sqrt{3x}+x^{\sqrt2}", - Height = 168.75, - FontSize = 22.5f - }; - - // General root - labels[12] = new MathView { - LaTeX = @"\sqrt[3]{24} + 3\sqrt{2}24", - Height = 75, - FontSize = 22.5f - }; - - // Fractions and formulae in root - labels[13] = new MathView { - LaTeX = @"\sqrt[x+\frac{3}{4}]{\frac{2}{4}+1}", - Height = 112.5, - FontSize = 22.5f - }; - - // Non-symbol operators with no limits - labels[14] = new MathView { - LaTeX = @"\sin^2(\theta)=\log_3^2(\pi)", - Height = 112.5, - FontSize = 22.5f - }; - - // Non-symbol operators with limits - labels[15] = new MathView { - LaTeX = @"\lim_{x\to\infty}\frac{e^2}{1-x}=\limsup_{\sigma}5", - Height = 112.5, - FontSize = 22.5f - }; - - // Symbol operators with limits - labels[16] = new MathView { - LaTeX = @"\sum_{n=1}^{\infty}\frac{1+n}{1-n}=\bigcup_{A\in\Im}C\cup B", - Height = 112.5, - FontSize = 22.5f - }; - - // Symbol operators with limits text style - labels[17] = new MathView { - LaTeX = @"\sum_{n=1}^{\infty}\frac{1+n}{1-n}=\bigcup_{A\in\Im}C\cup B", - Height = 112.5, - FontSize = 22.5f - }; - labels[17].LineStyle = LineStyle.Text; - - // Non-symbol operators with limits text style - labels[18] = new MathView { - LaTeX = @"\lim_{x\to\infty}\frac{e^2}{1-x}=\limsup_{\sigma}5", - Height = 112.5, - FontSize = 22.5f - }; - labels[18].LineStyle = LineStyle.Text; - - // Symbol operators with no limits - labels[19] = new MathView { - LaTeX = @"\int_{0}^{\infty}e^x \,dx=\oint_0^{\Delta}5\Gamma", - Height = 112.5, - FontSize = 22.5f - }; - - // Test italic correction for large ops - labels[20] = new MathView { - LaTeX = @"\int\int\int^{\infty}\int_0\int^{\infty}_0\int", - Height = 112.5, - FontSize = 22.5f - }; - - // Test italic correction for superscript/subscript - labels[21] = new MathView { - LaTeX = @"U_3^2UY_3^2U_3Y^2f_1f^2ff", - Height = 112.5, - FontSize = 22.5f - }; - - // Error - labels[22] = new MathView { - LaTeX = @"\notacommand", - Height = 56.25, - FontSize = 22.5f - }; - labels[23] = new MathView { - LaTeX = @"\sqrt{1}", - Height = 37.5, - FontSize = 22.5f - }; - labels[24] = new MathView { - LaTeX = @"\sqrt[|]{1}", - Height = 37.5, - FontSize = 22.5f - }; - labels[25] = new MathView { - LaTeX = @"{n \choose k}", - Height = 112.5, - FontSize = 22.5f - }; - labels[26] = new MathView { - LaTeX = @"{n \choose k}", - Height = 56.25, - FontSize = 22.5f - }; - labels[26].LineStyle = LineStyle.Text; - labels[27] = new MathView { - LaTeX = @"\left({n \atop k}\right)", - Height = 75, - FontSize = 22.5f - }; - labels[28] = new MathView { - LaTeX = @"\left({n \atop k}\right)", - Height = 56.25, - FontSize = 22.5f - }; - labels[28].LineStyle = LineStyle.Text; - labels[29] = new MathView { - LaTeX = @"\underline{xyz}+\overline{abc}", - Height = 56.25, - FontSize = 22.5f - }; - labels[30] = new MathView { - LaTeX = @"\underline{\frac12}+\overline{\frac34}", - Height = 93.75, - FontSize = 22.5f - }; - labels[31] = new MathView { - LaTeX = @"\underline{x^\overline{y}_\overline{z}+5}", - Height = 93.75, - FontSize = 22.5f - }; - - // spacing examples from the TeX book - labels[32] = new MathView { - LaTeX = @"\int\!\!\!\int_D dx\,dy", - Height = 93.75, - FontSize = 22.5f - }; - - // no spacing - labels[33] = new MathView { - LaTeX = @"\int\int_D dxdy", - Height = 93.75, - FontSize = 22.5f - }; - labels[34] = new MathView { - LaTeX = @"y\,dx-x\,dy", - Height = 56.25, - FontSize = 22.5f - }; - labels[35] = new MathView { - LaTeX = @"y dx - x dy", - Height = 56.25, - FontSize = 22.5f - }; - - // large spaces - labels[36] = new MathView { - LaTeX = @"hello\ from \quad the \qquad other\ side", - Height = 56.25, - FontSize = 22.5f - }; - - // Accents - labels[37] = new MathView { - LaTeX = @"\vec x \; \hat y \; \breve {x^2} \; \tilde x \tilde x^2 x^2", - Height = 56.25, - FontSize = 22.5f - }; - labels[38] = new MathView { - LaTeX = @"\hat{xyz} \; \widehat{xyz}\; \vec{2ab}", - Height = 56.25, - FontSize = 22.5f - }; - labels[39] = new MathView { - LaTeX = @"\hat{\frac12} \; \hat{\sqrt 3}", - Height = 93.75, - FontSize = 22.5f - }; - - // large roots - labels[40] = new MathView { - LaTeX = @"\colorbox{#f0f0e0}{\sqrt{1+\colorbox{#d0c0d0}{\sqrt{1+\colorbox{#a080c0}{\sqrt{1+\colorbox{#7050a0}{\sqrt{1+\colorbox{403060}{\colorbox{#102000}{\sqrt{1+\cdots}}}}}}}}}}}", - Height = 150, - FontSize = 22.5f - }; - labels[41] = new MathView { - LaTeX = @"\begin{bmatrix} - a & b\\ c & d \\ e & f \\ g & h \\ i & j - \end{bmatrix}", - Height = 225, - FontSize = 22.5f - }; - labels[42] = new MathView { - LaTeX = @"x{\scriptstyle y}z", - Height = 56.25, - FontSize = 22.5f - }; - labels[43] = new MathView { - LaTeX = @"x \mathrm x \mathbf x \mathcal X \mathfrak x \mathsf x \bm x \mathtt x \mathit \Lambda \cal g", - Height = 56.25, - FontSize = 22.5f - }; - labels[44] = new MathView { - LaTeX = @"\mathrm{using\ mathrm}", - Height = 56.25, - FontSize = 22.5f - }; - labels[45] = new MathView { - LaTeX = @"\text{using text}", - Height = 56.25, - FontSize = 22.5f - }; - labels[46] = new MathView { - LaTeX = @"\text{Mary has }\$500 + \$200.", - Height = 56.25, - FontSize = 22.5f - }; - labels[47] = new MathView { - LaTeX = @"\colorbox{#888888}{\begin{pmatrix} - \colorbox{#ff0000}{a} & \colorbox{#00ff00}{b} \\ - \colorbox{#00aaff}{c} & \colorbox{#f0f0f0}{d} - \end{pmatrix}}", - Height = 131.25, - FontSize = 22.5f - }; - - Views = demoLabels.Concat(labels).Select(p => p.Value).ToList().AsReadOnly(); - } - } -} diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MoreExamplesPage.xaml b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MoreExamplesPage.xaml deleted file mode 100644 index 898ca8e1..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MoreExamplesPage.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MoreExamplesPage.xaml.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MoreExamplesPage.xaml.cs deleted file mode 100644 index a65b3db4..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/MoreExamplesPage.xaml.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; - -namespace CSharpMath.Uno.Example.Shared { - public sealed partial class MoreExamplesPage : Page { - public MoreExamplesPage() { - this.InitializeComponent(); - foreach (var view in MoreExamples.Views) { - view.ErrorFontSize = view.FontSize * 0.8f; - Stack.Children.Add(view); - } - } - } -} diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/Strings/en/Resources.resw b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/Strings/en/Resources.resw deleted file mode 100644 index a00b39ee..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/Strings/en/Resources.resw +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/TextPage.xaml b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/TextPage.xaml deleted file mode 100644 index 01039e6c..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/TextPage.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/TextPage.xaml.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/TextPage.xaml.cs deleted file mode 100644 index 7cd303ee..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/TextPage.xaml.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; - -// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238 - -namespace CSharpMath.Uno.Example.Shared -{ - /// - /// An empty page that can be used on its own or navigated to within a Frame. - /// - public sealed partial class TextPage : Page - { - public TextPage() - { - this.InitializeComponent(); - } - } -} diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/TryPage.xaml b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/TryPage.xaml deleted file mode 100644 index 44045b99..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/TryPage.xaml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/TryPage.xaml.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/TryPage.xaml.cs deleted file mode 100644 index 368932b8..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Shared/TryPage.xaml.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; - -// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238 - -namespace CSharpMath.Uno.Example.Shared { - /// - /// An empty page that can be used on its own or navigated to within a Frame. - /// - public sealed partial class TryPage : Page { - public 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, 768, 864, 960 - }; - public TryPage() { - InitializeComponent(); - FontSizeComboBox.SelectedItem = View.FontSize; - FontSizeComboBox.SelectionChanged += (sender, e) => - View.FontSize = (float)FontSizeComboBox.SelectedItem; - Entry.TextChanged += (sender, e) => { - View.LaTeX = Entry.Text; - (Exit.Text, Exit.Foreground) = - (View.LaTeX, View.ErrorMessage != null ? new SolidColorBrush(Colors.Red) : new SolidColorBrush(Colors.Black)); - }; - } - } -} diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/lockscreenlogo.scale-200.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/lockscreenlogo.scale-200.png deleted file mode 100644 index 735f57ad..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/lockscreenlogo.scale-200.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/splashscreen.scale-200.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/splashscreen.scale-200.png deleted file mode 100644 index 023e7f1f..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/splashscreen.scale-200.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/square150x150logo.scale-200.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/square150x150logo.scale-200.png deleted file mode 100644 index af49fec1..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/square150x150logo.scale-200.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/square44x44logo.scale-200.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/square44x44logo.scale-200.png deleted file mode 100644 index ce342a2e..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/square44x44logo.scale-200.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/storelogo.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/storelogo.png deleted file mode 100644 index 7385b56c..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/storelogo.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/wide310x150logo.scale-200.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/wide310x150logo.scale-200.png deleted file mode 100644 index 288995b3..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Assets/wide310x150logo.scale-200.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/CSharpMath.Uno.Example.UWP.csproj b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/CSharpMath.Uno.Example.UWP.csproj deleted file mode 100644 index fd9a0298..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/CSharpMath.Uno.Example.UWP.csproj +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - 6.2.2 - - - - - 1.68.0 - - - - - Debug - x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2} - AppContainerExe - Properties - CSharpMath.Uno.Example - CSharpMath.Uno.Example - en-US - UAP - 10.0.17763.0 - 10.0.17763.0 - 14 - 512 - {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - CSharpMath.Uno.Example.Uwp_TemporaryKey.pfx - - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x86 - false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x86 - false - prompt - true - true - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - - - true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM64 - false - prompt - true - true - - - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM64 - false - prompt - true - true - - - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x64 - false - prompt - true - - - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x64 - false - prompt - true - true - - - - - {38f58489-ede4-4289-8acf-a9756977a7a6} - CSharpMath.Editor - - - {65016a61-2125-4e0c-90e8-a915230c7826} - CSharpMath.Rendering - - - {35b4bb5b-2202-436e-9afe-00997ca2cc65} - CSharpMath.SkiaSharp - - - {cbfa75c9-5b10-4df9-bc52-1559f9a664d5} - CSharpMath.Uno - - - {5157367b-f03e-4acb-83a1-0de414a3bfca} - CSharpMath - - - - - - - - Designer - - - - - - - - - - - - - - - 14.0 - - - - \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Package.appxmanifest b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Package.appxmanifest deleted file mode 100644 index d482a400..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Package.appxmanifest +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - CSharpMath.Uno.Example - CSharpMath.Uno.Example - Assets\StoreLogo.png - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Properties/AssemblyInfo.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Properties/AssemblyInfo.cs deleted file mode 100644 index ec04cec0..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CSharpMath.Uno.Example.UWP")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CSharpMath.Uno.Example.UWP")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Properties/Default.rd.xml b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Properties/Default.rd.xml deleted file mode 100644 index 80a960ce..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.UWP/Properties/Default.rd.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/Assets/SplashScreen.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/Assets/SplashScreen.png deleted file mode 100644 index 023e7f1f..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/Assets/SplashScreen.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/CSharpMath.Uno.Example.Wasm.csproj b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/CSharpMath.Uno.Example.Wasm.csproj deleted file mode 100644 index 88ba5ecb..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/CSharpMath.Uno.Example.Wasm.csproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - Exe - netstandard2.0 - true - $(DefineConstants);__WASM__ - NU1701 - - - true - $(DefineConstants);TRACE;DEBUG - portable - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/LinkerConfig.xml b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/LinkerConfig.xml deleted file mode 100644 index 6fa3bf0a..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/LinkerConfig.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/Program.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/Program.cs deleted file mode 100644 index 9275431a..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/Program.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using Windows.UI.Xaml; - -namespace CSharpMath.Uno.Example.Wasm -{ - public class Program - { - private static App _app; - - static int Main(string[] args) - { - Windows.UI.Xaml.Application.Start(_ => _app = new App()); - - return 0; - } - } -} diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/WasmCSS/Fonts.css b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/WasmCSS/Fonts.css deleted file mode 100644 index f69615d7..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/WasmCSS/Fonts.css +++ /dev/null @@ -1,10 +0,0 @@ -/** - 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. -*/ - -@font-face { - font-family: "Symbols"; - /* winjs-symbols.woff2: https://github.com/Microsoft/fonts/tree/master/Symbols */ - src: url(data:application/x-font-woff;charset=utf-8;base64,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) format('woff'); -} diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/WasmScripts/AppManifest.js b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/WasmScripts/AppManifest.js deleted file mode 100644 index 988f47c6..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/WasmScripts/AppManifest.js +++ /dev/null @@ -1,7 +0,0 @@ -var UnoAppManifest = { - - splashScreenImage: "Assets/SplashScreen.png", - splashScreenColor: "#0078D7", - displayName: "CSharpMath.Uno.Example" - -} diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/wwwroot/web.config b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/wwwroot/web.config deleted file mode 100644 index 85389df7..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.Wasm/wwwroot/web.config +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/CSharpMath.Uno.Example.iOS.csproj b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/CSharpMath.Uno.Example.iOS.csproj deleted file mode 100644 index 203938b0..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/CSharpMath.Uno.Example.iOS.csproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - Debug - iPhoneSimulator - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - CSharpMath.Uno.Example - Resources - CSharpMath.Uno.Example - - - ..\CSharpMath.Uno.Example.Shared\Strings - - - true - portable - false - bin\iPhoneSimulator\Debug - DEBUG - prompt - 4 - false - x86_64 - None - true - --setenv=MONO_LOG_LEVEL=debug --setenv=MONO_LOG_MASK=gc --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep - - - portable - true - bin\iPhoneSimulator\Release - prompt - 4 - None - x86_64 - false - --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep - - - true - full - false - bin\iPhone\Debug - DEBUG - prompt - 4 - false - ARM64 - Entitlements.plist - iPhone Developer - true - --setenv=MONO_LOG_LEVEL=debug --setenv=MONO_LOG_MASK=gc --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep - - - none - true - bin\iPhone\Release - prompt - 4 - Entitlements.plist - ARM64 - false - iPhone Distribution - true - true - true - --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep - - - none - True - bin\iPhone\Ad-Hoc - prompt - 4 - False - ARM64 - Entitlements.plist - True - Automatic:AdHoc - iPhone Distribution - - - none - True - bin\iPhone\AppStore - prompt - 4 - False - ARM64 - Entitlements.plist - Automatic:AppStore - iPhone Distribution - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - - - - {65016a61-2125-4e0c-90e8-a915230c7826} - CSharpMath.Rendering - - - {35b4bb5b-2202-436e-9afe-00997ca2cc65} - CSharpMath.SkiaSharp - - - {cbfa75c9-5b10-4df9-bc52-1559f9a664d5} - CSharpMath.Uno - - - {5157367b-f03e-4acb-83a1-0de414a3bfca} - CSharpMath - - - - - \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Entitlements.plist b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Entitlements.plist deleted file mode 100644 index 24c31036..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Entitlements.plist +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Info.plist b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Info.plist deleted file mode 100644 index 204bb2f1..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Info.plist +++ /dev/null @@ -1,55 +0,0 @@ - - - - - CFBundleDisplayName - CSharpMath.Uno.Example - CFBundleIdentifier - com.companyname.CSharpMath.Uno.Example - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1.0 - LSRequiresIPhoneOS - - MinimumOSVersion - 8.0 - UIDeviceFamily - - 1 - 2 - - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - armv7 - arm64 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIAppFonts - - Fonts/winjs-symbols.ttf - - UIViewControllerBasedStatusBarAppearance - - UILaunchImageMinimumOSVersion - 9.0 - UILaunchImageOrientation - Portrait - UILaunchImageSize - {320, 568} - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/LaunchScreen.storyboard b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/LaunchScreen.storyboard deleted file mode 100644 index 04a81ae7..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/LaunchScreen.storyboard +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Main.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Main.cs deleted file mode 100644 index 9a0bcf3b..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Main.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UIKit; - -namespace CSharpMath.Uno.Example.iOS -{ - public class Application - { - // This is the main entry point of the application. - static void Main(string[] args) - { - // if you want to use a different Application Delegate class from "AppDelegate" - // you can specify it here. - UIApplication.Main(args, null, typeof(App)); - } - } -} \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/Contents.json b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/Contents.json deleted file mode 100644 index 8292de75..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/Contents.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "images": [ - { - "scale": "2x", - "size": "29x29", - "idiom": "iphone" - }, - { - "scale": "3x", - "size": "29x29", - "idiom": "iphone" - }, - { - "scale": "2x", - "size": "40x40", - "idiom": "iphone" - }, - { - "scale": "3x", - "size": "60x60", - "idiom": "iphone" - }, - { - "scale": "1x", - "size": "20x20", - "idiom": "ipad" - }, - { - "scale": "2x", - "size": "20x20", - "idiom": "ipad" - }, - { - "scale": "1x", - "size": "29x29", - "idiom": "ipad" - }, - { - "scale": "2x", - "size": "29x29", - "idiom": "ipad" - }, - { - "scale": "1x", - "size": "40x40", - "idiom": "ipad" - }, - { - "scale": "2x", - "size": "40x40", - "idiom": "ipad" - }, - { - "scale": "1x", - "size": "76x76", - "idiom": "ipad" - }, - { - "scale": "2x", - "size": "20x20", - "idiom": "iphone", - "filename": "iPhone-20x20@2x.png" - }, - { - "scale": "3x", - "size": "20x20", - "idiom": "iphone", - "filename": "iPhone-20x20@3x.png" - }, - { - "scale": "3x", - "size": "40x40", - "idiom": "iphone", - "filename": "iPhone-40x40@3x.png" - }, - { - "scale": "2x", - "size": "60x60", - "idiom": "iphone", - "filename": "iPhone-60x60@2x.png" - }, - { - "scale": "2x", - "size": "76x76", - "idiom": "ipad", - "filename": "iPad-76x76@2x.png squaretile-sdk-ipad.png" - }, - { - "scale": "2x", - "size": "83.5x83.5", - "idiom": "ipad", - "filename": "iPad-84x84@2x.png" - }, - { - "scale": "1x", - "size": "1024x1024", - "idiom": "ios-marketing", - "filename": "ios-marketing-1024x1024@1x.png" - } - ], - "properties": {}, - "info": { - "version": 1, - "author": "xcode" - } -} diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPad-76x76@2x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPad-76x76@2x.png deleted file mode 100644 index 5b02c03d..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPad-76x76@2x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPad-84x84@2x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPad-84x84@2x.png deleted file mode 100644 index 5f38288d..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPad-84x84@2x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPhone-20x20@2x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPhone-20x20@2x.png deleted file mode 100644 index 15c895f3..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPhone-20x20@2x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPhone-20x20@3x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPhone-20x20@3x.png deleted file mode 100644 index 7c034c51..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPhone-20x20@3x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPhone-40x40@3x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPhone-40x40@3x.png deleted file mode 100644 index 5835894a..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPhone-40x40@3x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPhone-60x60@2x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPhone-60x60@2x.png deleted file mode 100644 index 5835894a..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/iPhone-60x60@2x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/ios-marketing-1024x1024@1x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/ios-marketing-1024x1024@1x.png deleted file mode 100644 index 7601500a..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/AppIcons.appiconset/ios-marketing-1024x1024@1x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/LaunchImages.launchimage/Contents.json b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/LaunchImages.launchimage/Contents.json deleted file mode 100644 index 69555e44..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Media.xcassets/LaunchImages.launchimage/Contents.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "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/CSharpMath.Uno.Example.iOS/Properties/AssemblyInfo.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Properties/AssemblyInfo.cs deleted file mode 100644 index c2d8d773..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CSharpMath.Uno.Example.iOS")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CSharpMath.Uno.Example.iOS")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("166de4ca-8f11-4ef9-bcf8-3e7834988e7d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Resources/Default-568h@2x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Resources/Default-568h@2x.png deleted file mode 100644 index 29973dcb..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Resources/Default-568h@2x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Resources/Fonts/winjs-symbols.ttf b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Resources/Fonts/winjs-symbols.ttf deleted file mode 100644 index 118f5c48..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Resources/Fonts/winjs-symbols.ttf and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Resources/SplashScreen@2x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Resources/SplashScreen@2x.png deleted file mode 100644 index f8e793d9..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Resources/SplashScreen@2x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Resources/SplashScreen@3x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Resources/SplashScreen@3x.png deleted file mode 100644 index 8c5f3984..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.iOS/Resources/SplashScreen@3x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png deleted file mode 100644 index 5757c31d..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png deleted file mode 100644 index d0fb3572..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png deleted file mode 100644 index 17d637b2..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png deleted file mode 100644 index cf3a6e3e..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png deleted file mode 100644 index dcaaf7fa..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png deleted file mode 100644 index 4810d2d0..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png deleted file mode 100644 index c02a2268..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png deleted file mode 100644 index d257b83a..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png deleted file mode 100644 index a9099508..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png deleted file mode 100644 index da4b8a99..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 6b285452..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "images": [ - { - "filename": "AppIcon-16.png", - "size": "16x16", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-16@2x.png", - "size": "16x16", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-32.png", - "size": "32x32", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-32@2x.png", - "size": "32x32", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-128.png", - "size": "128x128", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-128@2x.png", - "size": "128x128", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-256.png", - "size": "256x256", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-256@2x.png", - "size": "256x256", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-512.png", - "size": "512x512", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-512@2x.png", - "size": "512x512", - "scale": "2x", - "idiom": "mac" - } - ], - "info": { - "version": 1, - "author": "xcode" - } -} \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/Contents.json b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/Contents.json deleted file mode 100644 index 4caf392f..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/unologo.imageset/Contents.json b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/unologo.imageset/Contents.json deleted file mode 100644 index 9b481d06..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/unologo.imageset/Contents.json +++ /dev/null @@ -1,528 +0,0 @@ -{ - "images": [ - { - "idiom": "universal" - }, - { - "scale": "1x", - "idiom": "universal" - }, - { - "filename": "unoplatform.jpg", - "scale": "2x", - "idiom": "universal" - }, - { - "scale": "3x", - "idiom": "universal" - }, - { - "idiom": "iphone" - }, - { - "scale": "1x", - "idiom": "iphone" - }, - { - "scale": "2x", - "idiom": "iphone" - }, - { - "subtype": "retina4", - "scale": "2x", - "idiom": "iphone" - }, - { - "scale": "3x", - "idiom": "iphone" - }, - { - "idiom": "ipad" - }, - { - "scale": "1x", - "idiom": "ipad" - }, - { - "scale": "2x", - "idiom": "ipad" - }, - { - "idiom": "watch" - }, - { - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{130,145}", - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{146,165}", - "scale": "2x", - "idiom": "watch" - }, - { - "idiom": "mac" - }, - { - "scale": "1x", - "idiom": "mac" - }, - { - "scale": "2x", - "idiom": "mac" - }, - { - "idiom": "car" - }, - { - "scale": "2x", - "idiom": "car" - }, - { - "scale": "3x", - "idiom": "car" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "1x", - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "3x", - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "1x", - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "iphone" - }, - { - "subtype": "retina4", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "3x", - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "ipad" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "1x", - "idiom": "ipad" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "ipad" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "watch" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{130,145}", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{146,165}", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "watch" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "mac" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "1x", - "idiom": "mac" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "mac" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "car" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "2x", - "idiom": "car" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "scale": "3x", - "idiom": "car" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "1x", - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "3x", - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "1x", - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "iphone" - }, - { - "subtype": "retina4", - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "3x", - "idiom": "iphone" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "idiom": "ipad" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "1x", - "idiom": "ipad" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "ipad" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "idiom": "watch" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{130,145}", - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{146,165}", - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "watch" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "idiom": "mac" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "1x", - "idiom": "mac" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "mac" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "idiom": "car" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "2x", - "idiom": "car" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "light" - } - ], - "scale": "3x", - "idiom": "car" - } - ], - "info": { - "version": 1, - "author": "xcode" - } -} \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/unologo.imageset/unoplatform.jpg b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/unologo.imageset/unoplatform.jpg deleted file mode 100644 index da3230e5..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Assets.xcassets/unologo.imageset/unoplatform.jpg and /dev/null differ diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/CSharpMath.Uno.Example.macOS.csproj b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/CSharpMath.Uno.Example.macOS.csproj deleted file mode 100644 index b36175e0..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/CSharpMath.Uno.Example.macOS.csproj +++ /dev/null @@ -1,123 +0,0 @@ - - - - Debug - iPhoneSimulator - 779b98da-c513-4d3c-84b8-51474004e1f9 - {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - CSharpMath.Uno.Example.macOS - CSharpMath.Uno.Example.macOS - v2.0 - Xamarin.Mac - Resources - - - true - full - false - bin\Debug - DEBUG - prompt - 4 - false - Mac Developer - false - false - false - true - true - true - - - - - - - false - pdbonly - true - bin\Release - - prompt - 4 - false - true - false - true - true - true - SdkOnly - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - - - - - <_ReferenceToRemove Include="@(Reference)" Condition="'%(Reference.Identity)'=='System.Memory'" /> - - - - - - - <_ReferencePathToRemove Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='System.Memory'" /> - - - - \ No newline at end of file diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Entitlements.plist b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Entitlements.plist deleted file mode 100644 index e9a3005f..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Entitlements.plist +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Info.plist b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Info.plist deleted file mode 100644 index de54d870..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleName - CSharpMath.Uno.Example.macOS - CFBundleIdentifier - com.companyname.CSharpMath.Uno.Example-macOS - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSMinimumSystemVersion - 10.11 - CFBundleDevelopmentRegion - en - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - NSHumanReadableCopyright - ${AuthorCopyright:HtmlEncode} - NSPrincipalClass - NSApplication - XSAppIconAssets - Assets.xcassets/AppIcon.appiconset - ATSApplicationFontsPath - Fonts/winjs-symbols.ttf - - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Main.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Main.cs deleted file mode 100644 index d40dba51..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Main.cs +++ /dev/null @@ -1,15 +0,0 @@ -using AppKit; - -namespace CSharpMath.Uno.Example.macOS -{ - static class MainClass - { - static void Main(string[] args) - { - NSApplication.Init(); - NSApplication.SharedApplication.Delegate = new App(); - NSApplication.Main(args); - } - } -} - diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Properties/AssemblyInfo.cs b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Properties/AssemblyInfo.cs deleted file mode 100644 index ef1be1b5..00000000 --- a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CSharpMath.Uno.Example.macOS")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CSharpMath.Uno.Example.macOS")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("166de4ca-8f11-4ef9-bcf8-3e7834988e7d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Resources/Fonts/winjs-symbols.ttf b/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Resources/Fonts/winjs-symbols.ttf deleted file mode 100644 index 118f5c48..00000000 Binary files a/CSharpMath.Uno.Example/CSharpMath.Uno.Example.macOS/Resources/Fonts/winjs-symbols.ttf and /dev/null differ diff --git a/CSharpMath.Xaml/Views.cs b/CSharpMath.Xaml/Views.cs index d0db8d99..a3466b25 100644 --- a/CSharpMath.Xaml/Views.cs +++ b/CSharpMath.Xaml/Views.cs @@ -10,6 +10,7 @@ using XCanvas = CSharpMath.Avalonia.AvaloniaCanvas; using XCanvasColor = Avalonia.Media.Color; using XColor = Avalonia.Media.Color; +using XThickness = Avalonia.Thickness; using XControl = Avalonia.Controls.Control; using XInheritControl = Avalonia.Controls.Control; using XProperty = Avalonia.AvaloniaProperty; @@ -18,6 +19,7 @@ namespace CSharpMath.Avalonia { using XCanvas = SkiaSharp.SKCanvas; using XCanvasColor = SkiaSharp.SKColor; using XColor = Xamarin.Forms.Color; +using XThickness = Xamarin.Forms.Thickness; using XControl = Xamarin.Forms.View; using XInheritControl = SkiaSharp.Views.Forms.SKCanvasView; using XProperty = Xamarin.Forms.BindableProperty; @@ -29,12 +31,13 @@ namespace CSharpMath.Forms { using XCanvas = SkiaSharp.SKCanvas; using XCanvasColor = SkiaSharp.SKColor; using XColor = Windows.UI.Color; +using XThickness = Windows.UI.Xaml.Thickness; using XControl = Windows.UI.Xaml.Controls.Control; using XInheritControl = SkiaSharp.Views.UWP.SKXamlCanvas; using XProperty = Windows.UI.Xaml.DependencyProperty; using MathPainter = CSharpMath.SkiaSharp.MathPainter; using TextPainter = CSharpMath.SkiaSharp.TextPainter; -namespace CSharpMath.Uno { +namespace CSharpMath.UWPUno { [global::Windows.UI.Xaml.Markup.ContentProperty(Name = nameof(LaTeX))] #endif public partial class BaseView : XInheritControl, ICSharpMathAPI @@ -222,7 +225,7 @@ protected sealed override void OnPaintSurface(global::SkiaSharp.Views.UWP.SKPain e.Surface.Canvas.Clear(); var canvas = e.Surface.Canvas; #endif - Painter.Draw(canvas, TextAlignment, Padding, DisplacementX, DisplacementY); + Painter.Draw(canvas, TextAlignment, new Thickness((float)Padding.Left, (float)Padding.Top, (float)Padding.Right, (float)Padding.Bottom), (float)DisplacementX, (float)DisplacementY); } /// Requires touch events to be enabled in SkiaSharp/Xamarin.Forms public bool EnablePanning { get => (bool)GetValue(DisablePanningProperty); set => SetValue(DisablePanningProperty, value); } @@ -246,11 +249,11 @@ protected sealed override void OnPaintSurface(global::SkiaSharp.Views.UWP.SKPain public bool DisplayErrorInline { get => (bool)GetValue(DisplayErrorInlineProperty); set => SetValue(DisplayErrorInlineProperty, value); } public static readonly XProperty DisplayErrorInlineProperty = CreateProperty, bool>(nameof(DisplayErrorInline), true, p => p.DisplayErrorInline, (p, v) => p.DisplayErrorInline = v); /// Unit of measure: points - public float FontSize { get => (float)GetValue(FontSizeProperty); set => SetValue(FontSizeProperty, value); } - public static readonly XProperty FontSizeProperty = CreateProperty, float>(nameof(FontSize), true, p => p.FontSize, (p, v) => p.FontSize = v); + public double FontSize { get => (double)GetValue(FontSizeProperty); set => SetValue(FontSizeProperty, value); } + public static readonly XProperty FontSizeProperty = CreateProperty, double>(nameof(FontSize), true, p => p.FontSize, (p, v) => p.FontSize = (float)v); /// Unit of measure: points; Defaults to . - public float? ErrorFontSize { get => (float?)GetValue(ErrorFontSizeProperty); set => SetValue(ErrorFontSizeProperty, value); } - public static readonly XProperty ErrorFontSizeProperty = CreateProperty, float?>(nameof(ErrorFontSize), true, p => p.ErrorFontSize, (p, v) => p.ErrorFontSize = v); + public double? ErrorFontSize { get => (double?)GetValue(ErrorFontSizeProperty); set => SetValue(ErrorFontSizeProperty, value); } + public static readonly XProperty ErrorFontSizeProperty = CreateProperty, double?>(nameof(ErrorFontSize), true, p => p.ErrorFontSize, (p, v) => p.ErrorFontSize = (float?)v); public IEnumerable LocalTypefaces { get => (IEnumerable)GetValue(LocalTypefacesProperty); set => SetValue(LocalTypefacesProperty, value); } public static readonly XProperty LocalTypefacesProperty = CreateProperty, IEnumerable>(nameof(LocalTypefaces), true, p => p.LocalTypefaces, (p, v) => p.LocalTypefaces = v); public XColor TextColor { get => (XColor)GetValue(TextColorProperty); set => SetValue(TextColorProperty, value); } @@ -261,14 +264,14 @@ protected sealed override void OnPaintSurface(global::SkiaSharp.Views.UWP.SKPain public static readonly XProperty ErrorColorProperty = CreateProperty, XColor>(nameof(ErrorColor), false, p => XCanvasColorToXColor(p.ErrorColor), (p, v) => p.ErrorColor = XColorToXCanvasColor(v)); public TextAlignment TextAlignment { get => (TextAlignment)GetValue(TextAlignmentProperty); set => SetValue(TextAlignmentProperty, value); } public static readonly XProperty TextAlignmentProperty = CreateProperty, TextAlignment>(nameof(Rendering.FrontEnd.TextAlignment), false, p => (TextAlignment)drawMethodParams[1].DefaultValue, (p, v) => { }); - public Thickness Padding { get => (Thickness)GetValue(PaddingProperty); set => SetValue(PaddingProperty, value); } - public static readonly XProperty PaddingProperty = CreateProperty, Thickness>(nameof(Padding), false, p => (Thickness)(drawMethodParams[2].DefaultValue ?? new Thickness()), (p, v) => { }); - public float DisplacementX { get => (float)GetValue(DisplacementXProperty); set => SetValue(DisplacementXProperty, value); } - public static readonly XProperty DisplacementXProperty = CreateProperty, float>(nameof(DisplacementX), false, p => (float)drawMethodParams[3].DefaultValue, (p, v) => { }); - public float DisplacementY { get => (float)GetValue(DisplacementYProperty); set => SetValue(DisplacementYProperty, value); } - public static readonly XProperty DisplacementYProperty = CreateProperty, float>(nameof(DisplacementY), false, p => (float)drawMethodParams[4].DefaultValue, (p, v) => { }); - public float Magnification { get => (float)GetValue(MagnificationProperty); set => SetValue(MagnificationProperty, value); } - public static readonly XProperty MagnificationProperty = CreateProperty, float>(nameof(Magnification), false, p => p.Magnification, (p, v) => p.Magnification = v); + public XThickness Padding { get => (XThickness)GetValue(PaddingProperty); set => SetValue(PaddingProperty, value); } + public static readonly XProperty PaddingProperty = CreateProperty, XThickness>(nameof(Padding), false, p => (XThickness)(drawMethodParams[2].DefaultValue ?? new XThickness()), (p, v) => { }); + public double DisplacementX { get => (double)GetValue(DisplacementXProperty); set => SetValue(DisplacementXProperty, value); } + public static readonly XProperty DisplacementXProperty = CreateProperty, double>(nameof(DisplacementX), false, p => (double)drawMethodParams[3].DefaultValue, (p, v) => { }); + public double DisplacementY { get => (double)GetValue(DisplacementYProperty); set => SetValue(DisplacementYProperty, value); } + public static readonly XProperty DisplacementYProperty = CreateProperty, double>(nameof(DisplacementY), false, p => (double)drawMethodParams[4].DefaultValue, (p, v) => { }); + public double Magnification { get => (double)GetValue(MagnificationProperty); set => SetValue(MagnificationProperty, value); } + public static readonly XProperty MagnificationProperty = CreateProperty, double>(nameof(Magnification), false, p => p.Magnification, (p, v) => p.Magnification = (float)v); public PaintStyle PaintStyle { get => (PaintStyle)GetValue(PaintStyleProperty); set => SetValue(PaintStyleProperty, value); } public static readonly XProperty PaintStyleProperty = CreateProperty, PaintStyle>(nameof(PaintStyle), false, p => p.PaintStyle, (p, v) => p.PaintStyle = v); public LineStyle LineStyle { get => (LineStyle)GetValue(LineStyleProperty); set => SetValue(LineStyleProperty, value); } diff --git a/CSharpMath.sln b/CSharpMath.sln index b6d06680..669b5600 100644 --- a/CSharpMath.sln +++ b/CSharpMath.sln @@ -69,7 +69,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpMath.Editor.Tests", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpMath.Editor.Tests.Visualizer", "CSharpMath.Editor.Tests.Visualizer\CSharpMath.Editor.Tests.Visualizer.csproj", "{C60126CE-A71D-4D11-A4A8-A45B67312E98}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "CSharpMath.Editor.Tests.FSharp", "CSharpMath.Editor.Tests.FSharp\CSharpMath.Editor.Tests.FSharp.fsproj", "{65492AC6-8B98-42FF-AAA1-1DBDC050A25F}" +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "CSharpMath.Editor.Tests.FSharp", "CSharpMath.Editor.Tests.FSharp\CSharpMath.Editor.Tests.FSharp.fsproj", "{65492AC6-8B98-42FF-AAA1-1DBDC050A25F}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PixelFarm.Typography (Excerpt)", "PixelFarm.Typography (Excerpt)\PixelFarm.Typography (Excerpt).shproj", "{3ECA00B3-0925-4418-B6F2-AC49AA3520BB}" EndProject @@ -104,28 +104,19 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "AngouriMath\Tests\UnitTests\UnitTests.csproj", "{1EE81B65-9B82-43B2-8C2C-4FC691F2D450}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpMath.Ios.Tests", "CSharpMath.Ios.Tests\CSharpMath.Ios.Tests.csproj", "{30C91103-12E5-47AE-85FE-41B0218A8997}" -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnoPlatform", "UnoPlatform", "{7074DA21-91A3-4F01-B527-08DDE1EA4955}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpMath.Uno", "CSharpMath.Uno\CSharpMath.Uno.csproj", "{CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UWPUno", "UWPUno", "{7074DA21-91A3-4F01-B527-08DDE1EA4955}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpMath.SkiaSharp.Wasm", "CSharpMath.SkiaSharp.Wasm\CSharpMath.SkiaSharp.Wasm.csproj", "{0CE08055-BDE9-4400-87C0-F2AEFA2161F0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpMath.UWPUno", "UWPUno\CSharpMath.UWPUno\CSharpMath.UWPUno.csproj", "{078B088C-FDAD-4C17-8D20-CDD17BC8897B}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CSharpMath.Uno.Example.Shared", "CSharpMath.Uno.Example\CSharpMath.Uno.Example.Shared\CSharpMath.Uno.Example.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpMath.UWPUno.SkiaSharp.Wasm", "UWPUno\CSharpMath.UWPUno.SkiaSharp.Wasm\CSharpMath.UWPUno.SkiaSharp.Wasm.csproj", "{4DD5B78F-3D35-45F8-BB41-4562A36339D0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpMath.Uno.Example.Droid", "CSharpMath.Uno.Example\CSharpMath.Uno.Example.Droid\CSharpMath.Uno.Example.Droid.csproj", "{A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpMath.Uno.Example.iOS", "CSharpMath.Uno.Example\CSharpMath.Uno.Example.iOS\CSharpMath.Uno.Example.iOS.csproj", "{180F0D4F-EFB8-493F-83A6-5D15A764E9F6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpMath.Uno.Example.UWP", "CSharpMath.Uno.Example\CSharpMath.Uno.Example.UWP\CSharpMath.Uno.Example.UWP.csproj", "{756C0212-8355-4B5A-8E28-FC709E4ED6C2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpMath.Uno.Example.Wasm", "CSharpMath.Uno.Example\CSharpMath.Uno.Example.Wasm\CSharpMath.Uno.Example.Wasm.csproj", "{61993DD5-15BD-4BAE-9B22-7599B9C982A6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpMath.Uno.Example.macOS", "CSharpMath.Uno.Example\CSharpMath.Uno.Example.macOS\CSharpMath.Uno.Example.macOS.csproj", "{779B98DA-C513-4D3C-84B8-51474004E1F9}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CSharpMath.Uno.Example.Shared", "UWPUno\CSharpMath.UWPUno.Example\CSharpMath.Uno.Example.Shared\CSharpMath.Uno.Example.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution + CSharpMath.Xaml\CSharpMath.Xaml.projitems*{078b088c-fdad-4c17-8d20-cdd17bc8897b}*SharedItemsImports = 5 CSharpMath.Apple\CSharpMath.Apple.projitems*{11d4e6c7-c8e2-449c-a1e7-18bbbce4e6f3}*SharedItemsImports = 5 - CSharpMath.Uno.Example\CSharpMath.Uno.Example.Shared\CSharpMath.Uno.Example.Shared.projitems*{180f0d4f-efb8-493f-83a6-5d15a764e9f6}*SharedItemsImports = 4 CSharpMath.Apple\CSharpMath.Apple.projitems*{1e62c0f0-b5c9-430e-addc-6f6ec6e0bde1}*SharedItemsImports = 13 Typography\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{20986a1a-bf57-4ea7-92e1-e88d3c70874b}*SharedItemsImports = 5 Typography\Typography.OpenFont\Typography.OpenFont.projitems*{20986a1a-bf57-4ea7-92e1-e88d3c70874b}*SharedItemsImports = 5 @@ -134,19 +125,14 @@ Global Typography\Typography.TextBreak\Typography.TextBreak\Typography.TextBreak.projitems*{2e593fca-b809-4270-9eb2-93f380af2d6c}*SharedItemsImports = 5 PixelFarm.Typography (Excerpt)\PixelFarm.Typography (Excerpt).projitems*{3eca00b3-0925-4418-b6f2-ac49aa3520bb}*SharedItemsImports = 13 CSharpMath.Xaml\CSharpMath.Xaml.projitems*{56166c6c-b3b4-4bae-823e-b3d24c080394}*SharedItemsImports = 5 - CSharpMath.Uno.Example\CSharpMath.Uno.Example.Shared\CSharpMath.Uno.Example.Shared.projitems*{61993dd5-15bd-4bae-9b22-7599b9c982a6}*SharedItemsImports = 5 - CSharpMath.Uno.Example\CSharpMath.Uno.Example.Shared\CSharpMath.Uno.Example.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 + UWPUno\CSharpMath.UWPUno.Example\CSharpMath.Uno.Example.Shared\CSharpMath.Uno.Example.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 PixelFarm.Typography (Excerpt)\PixelFarm.Typography (Excerpt).projitems*{65016a61-2125-4e0c-90e8-a915230c7826}*SharedItemsImports = 5 Typography\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{65016a61-2125-4e0c-90e8-a915230c7826}*SharedItemsImports = 5 Typography\Typography.OpenFont\Typography.OpenFont.projitems*{65016a61-2125-4e0c-90e8-a915230c7826}*SharedItemsImports = 5 Typography\Typography.TextBreak\Typography.TextBreak\Typography.TextBreak.projitems*{65016a61-2125-4e0c-90e8-a915230c7826}*SharedItemsImports = 5 - CSharpMath.Uno.Example\CSharpMath.Uno.Example.Shared\CSharpMath.Uno.Example.Shared.projitems*{756c0212-8355-4b5a-8e28-fc709e4ed6c2}*SharedItemsImports = 4 - CSharpMath.Uno.Example\CSharpMath.Uno.Example.Shared\CSharpMath.Uno.Example.Shared.projitems*{779b98da-c513-4d3c-84b8-51474004e1f9}*SharedItemsImports = 4 CSharpMath.Wiki\CSharpMath.Wiki.projitems*{883bcfb1-3aa8-4ab7-8f82-27b849716373}*SharedItemsImports = 13 Typography\Typography.TextBreak\Typography.TextBreak\Typography.TextBreak.projitems*{9a99f103-b119-4a4d-8093-6a03baa6d36b}*SharedItemsImports = 13 CSharpMath.Xaml\CSharpMath.Xaml.projitems*{9bad6846-0b1d-4446-bf62-fcf85c6e9a9f}*SharedItemsImports = 5 - CSharpMath.Uno.Example\CSharpMath.Uno.Example.Shared\CSharpMath.Uno.Example.Shared.projitems*{a3518be3-cca9-4822-ace9-84961df0d1ee}*SharedItemsImports = 4 - CSharpMath.Xaml\CSharpMath.Xaml.projitems*{cbfa75c9-5b10-4df9-bc52-1559f9a664d5}*SharedItemsImports = 5 CSharpMath.Xaml\CSharpMath.Xaml.projitems*{d37416fb-3025-4a64-81ce-89da21062acb}*SharedItemsImports = 13 Typography\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{d8861cf8-c506-472b-8a57-632bd6ca6496}*SharedItemsImports = 13 EndGlobalSection @@ -1824,415 +1810,13 @@ Global {1EE81B65-9B82-43B2-8C2C-4FC691F2D450}.Release|x64.Build.0 = Release|Any CPU {1EE81B65-9B82-43B2-8C2C-4FC691F2D450}.Release|x86.ActiveCfg = Release|Any CPU {1EE81B65-9B82-43B2-8C2C-4FC691F2D450}.Release|x86.Build.0 = Release|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.AppStore|ARM.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.AppStore|ARM64.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.AppStore|ARM64.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.AppStore|iPhone.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.AppStore|x64.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.AppStore|x64.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.AppStore|x86.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.AppStore|x86.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Debug|ARM.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Debug|ARM.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Debug|ARM64.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Debug|iPhone.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Debug|x64.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Debug|x64.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Debug|x86.ActiveCfg = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Debug|x86.Build.0 = Debug|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Release|Any CPU.Build.0 = Release|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Release|ARM.ActiveCfg = Release|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Release|ARM.Build.0 = Release|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Release|ARM64.ActiveCfg = Release|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Release|ARM64.Build.0 = Release|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Release|iPhone.ActiveCfg = Release|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Release|iPhone.Build.0 = Release|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Release|x64.ActiveCfg = Release|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Release|x64.Build.0 = Release|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Release|x86.ActiveCfg = Release|Any CPU - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5}.Release|x86.Build.0 = Release|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.AppStore|ARM.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.AppStore|ARM64.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.AppStore|ARM64.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.AppStore|iPhone.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.AppStore|x64.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.AppStore|x64.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.AppStore|x86.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.AppStore|x86.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Debug|ARM.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Debug|ARM.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Debug|ARM64.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Debug|iPhone.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Debug|x64.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Debug|x64.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Debug|x86.ActiveCfg = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Debug|x86.Build.0 = Debug|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Release|Any CPU.Build.0 = Release|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Release|ARM.ActiveCfg = Release|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Release|ARM.Build.0 = Release|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Release|ARM64.ActiveCfg = Release|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Release|ARM64.Build.0 = Release|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Release|iPhone.ActiveCfg = Release|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Release|iPhone.Build.0 = Release|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Release|x64.ActiveCfg = Release|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Release|x64.Build.0 = Release|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Release|x86.ActiveCfg = Release|Any CPU - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0}.Release|x86.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|ARM.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|ARM.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|ARM64.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|ARM64.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|ARM64.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|x64.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|x64.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|x86.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Ad-Hoc|x86.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|Any CPU.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|Any CPU.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|ARM.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|ARM.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|ARM.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|ARM64.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|ARM64.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|ARM64.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|iPhone.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|iPhone.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|x64.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|x64.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|x64.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|x86.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|x86.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.AppStore|x86.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|ARM.ActiveCfg = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|ARM.Build.0 = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|ARM.Deploy.0 = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|ARM64.Build.0 = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|ARM64.Deploy.0 = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|iPhone.Build.0 = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|iPhone.Deploy.0 = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|x64.ActiveCfg = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|x64.Build.0 = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|x64.Deploy.0 = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|x86.ActiveCfg = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|x86.Build.0 = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Debug|x86.Deploy.0 = Debug|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|Any CPU.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|Any CPU.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|ARM.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|ARM.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|ARM.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|ARM64.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|ARM64.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|ARM64.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|iPhone.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|iPhone.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|iPhone.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|x64.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|x64.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|x64.Deploy.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|x86.ActiveCfg = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|x86.Build.0 = Release|Any CPU - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE}.Release|x86.Deploy.0 = Release|Any CPU - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Ad-Hoc|ARM64.ActiveCfg = Ad-Hoc|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.AppStore|ARM.ActiveCfg = AppStore|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.AppStore|ARM64.ActiveCfg = AppStore|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.AppStore|iPhone.ActiveCfg = AppStore|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.AppStore|iPhone.Build.0 = AppStore|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.AppStore|x64.ActiveCfg = AppStore|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.AppStore|x86.ActiveCfg = AppStore|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Debug|Any CPU.ActiveCfg = Debug|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Debug|ARM.ActiveCfg = Debug|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Debug|ARM64.ActiveCfg = Debug|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Debug|iPhone.ActiveCfg = Debug|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Debug|iPhone.Build.0 = Debug|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Debug|iPhone.Deploy.0 = Debug|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Debug|x64.ActiveCfg = Debug|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Debug|x86.ActiveCfg = Debug|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Release|Any CPU.ActiveCfg = Release|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Release|ARM.ActiveCfg = Release|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Release|ARM64.ActiveCfg = Release|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Release|iPhone.ActiveCfg = Release|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Release|iPhone.Build.0 = Release|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Release|x64.ActiveCfg = Release|iPhone - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6}.Release|x86.ActiveCfg = Release|iPhone - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|Any CPU.ActiveCfg = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|Any CPU.Build.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|Any CPU.Deploy.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|ARM.ActiveCfg = Release|ARM - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|ARM.Build.0 = Release|ARM - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|ARM.Deploy.0 = Release|ARM - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|ARM64.ActiveCfg = Release|ARM64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|ARM64.Build.0 = Release|ARM64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|ARM64.Deploy.0 = Release|ARM64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|iPhone.ActiveCfg = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|iPhone.Build.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|iPhone.Deploy.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|x64.ActiveCfg = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|x64.Build.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|x64.Deploy.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|x86.ActiveCfg = Release|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|x86.Build.0 = Release|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Ad-Hoc|x86.Deploy.0 = Release|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|Any CPU.ActiveCfg = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|Any CPU.Build.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|Any CPU.Deploy.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|ARM.ActiveCfg = Release|ARM - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|ARM.Build.0 = Release|ARM - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|ARM.Deploy.0 = Release|ARM - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|ARM64.ActiveCfg = Release|ARM64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|ARM64.Build.0 = Release|ARM64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|ARM64.Deploy.0 = Release|ARM64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|iPhone.ActiveCfg = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|iPhone.Build.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|iPhone.Deploy.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|iPhoneSimulator.ActiveCfg = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|iPhoneSimulator.Build.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|iPhoneSimulator.Deploy.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|x64.ActiveCfg = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|x64.Build.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|x64.Deploy.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|x86.ActiveCfg = Release|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|x86.Build.0 = Release|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.AppStore|x86.Deploy.0 = Release|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|Any CPU.ActiveCfg = Debug|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|ARM.ActiveCfg = Debug|ARM - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|ARM.Build.0 = Debug|ARM - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|ARM.Deploy.0 = Debug|ARM - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|ARM64.Build.0 = Debug|ARM64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|iPhone.ActiveCfg = Debug|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|x64.ActiveCfg = Debug|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|x64.Build.0 = Debug|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|x64.Deploy.0 = Debug|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|x86.ActiveCfg = Debug|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|x86.Build.0 = Debug|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Debug|x86.Deploy.0 = Debug|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|Any CPU.ActiveCfg = Release|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|ARM.ActiveCfg = Release|ARM - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|ARM.Build.0 = Release|ARM - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|ARM.Deploy.0 = Release|ARM - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|ARM64.ActiveCfg = Release|ARM64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|ARM64.Build.0 = Release|ARM64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|ARM64.Deploy.0 = Release|ARM64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|iPhone.ActiveCfg = Release|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|iPhoneSimulator.ActiveCfg = Release|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|x64.ActiveCfg = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|x64.Build.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|x64.Deploy.0 = Release|x64 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|x86.ActiveCfg = Release|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|x86.Build.0 = Release|x86 - {756C0212-8355-4B5A-8E28-FC709E4ED6C2}.Release|x86.Deploy.0 = Release|x86 - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.AppStore|ARM.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.AppStore|ARM64.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.AppStore|ARM64.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.AppStore|iPhone.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.AppStore|x64.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.AppStore|x64.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.AppStore|x86.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.AppStore|x86.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Debug|ARM.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Debug|ARM.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Debug|ARM64.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Debug|iPhone.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Debug|x64.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Debug|x64.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Debug|x86.ActiveCfg = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Debug|x86.Build.0 = Debug|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Release|Any CPU.Build.0 = Release|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Release|ARM.ActiveCfg = Release|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Release|ARM.Build.0 = Release|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Release|ARM64.ActiveCfg = Release|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Release|ARM64.Build.0 = Release|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Release|iPhone.ActiveCfg = Release|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Release|iPhone.Build.0 = Release|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Release|x64.ActiveCfg = Release|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Release|x64.Build.0 = Release|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Release|x86.ActiveCfg = Release|Any CPU - {61993DD5-15BD-4BAE-9B22-7599B9C982A6}.Release|x86.Build.0 = Release|Any CPU - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Ad-Hoc|Any CPU.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Ad-Hoc|Any CPU.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Ad-Hoc|ARM.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Ad-Hoc|ARM.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Ad-Hoc|ARM64.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Ad-Hoc|ARM64.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Ad-Hoc|iPhone.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Ad-Hoc|iPhone.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Ad-Hoc|x64.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Ad-Hoc|x64.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Ad-Hoc|x86.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Ad-Hoc|x86.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.AppStore|Any CPU.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.AppStore|Any CPU.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.AppStore|ARM.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.AppStore|ARM.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.AppStore|ARM64.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.AppStore|ARM64.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.AppStore|iPhone.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.AppStore|iPhone.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.AppStore|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.AppStore|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.AppStore|x64.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.AppStore|x64.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.AppStore|x86.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.AppStore|x86.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Debug|ARM64.ActiveCfg = Debug|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Debug|iPhone.ActiveCfg = Debug|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Release|ARM.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Release|iPhone.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Release|x64.ActiveCfg = Release|iPhoneSimulator - {779B98DA-C513-4D3C-84B8-51474004E1F9}.Release|x86.ActiveCfg = Release|iPhoneSimulator {30C91103-12E5-47AE-85FE-41B0218A8997}.Ad-Hoc|Any CPU.ActiveCfg = Debug|iPhoneSimulator {30C91103-12E5-47AE-85FE-41B0218A8997}.Ad-Hoc|Any CPU.Build.0 = Debug|iPhoneSimulator {30C91103-12E5-47AE-85FE-41B0218A8997}.Ad-Hoc|ARM.ActiveCfg = Release|iPhoneSimulator {30C91103-12E5-47AE-85FE-41B0218A8997}.Ad-Hoc|ARM.Build.0 = Release|iPhoneSimulator + {30C91103-12E5-47AE-85FE-41B0218A8997}.Ad-Hoc|ARM64.ActiveCfg = Debug|iPhone + {30C91103-12E5-47AE-85FE-41B0218A8997}.Ad-Hoc|ARM64.Build.0 = Debug|iPhone + {30C91103-12E5-47AE-85FE-41B0218A8997}.Ad-Hoc|ARM64.Deploy.0 = Debug|iPhone {30C91103-12E5-47AE-85FE-41B0218A8997}.Ad-Hoc|iPhone.ActiveCfg = Release|iPhone {30C91103-12E5-47AE-85FE-41B0218A8997}.Ad-Hoc|iPhone.Build.0 = Release|iPhone {30C91103-12E5-47AE-85FE-41B0218A8997}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator @@ -2245,6 +1829,9 @@ Global {30C91103-12E5-47AE-85FE-41B0218A8997}.AppStore|Any CPU.Build.0 = Debug|iPhoneSimulator {30C91103-12E5-47AE-85FE-41B0218A8997}.AppStore|ARM.ActiveCfg = Release|iPhoneSimulator {30C91103-12E5-47AE-85FE-41B0218A8997}.AppStore|ARM.Build.0 = Release|iPhoneSimulator + {30C91103-12E5-47AE-85FE-41B0218A8997}.AppStore|ARM64.ActiveCfg = Debug|iPhone + {30C91103-12E5-47AE-85FE-41B0218A8997}.AppStore|ARM64.Build.0 = Debug|iPhone + {30C91103-12E5-47AE-85FE-41B0218A8997}.AppStore|ARM64.Deploy.0 = Debug|iPhone {30C91103-12E5-47AE-85FE-41B0218A8997}.AppStore|iPhone.ActiveCfg = Release|iPhone {30C91103-12E5-47AE-85FE-41B0218A8997}.AppStore|iPhone.Build.0 = Release|iPhone {30C91103-12E5-47AE-85FE-41B0218A8997}.AppStore|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator @@ -2257,6 +1844,7 @@ Global {30C91103-12E5-47AE-85FE-41B0218A8997}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator {30C91103-12E5-47AE-85FE-41B0218A8997}.Debug|ARM.ActiveCfg = Debug|iPhone {30C91103-12E5-47AE-85FE-41B0218A8997}.Debug|ARM.Build.0 = Debug|iPhone + {30C91103-12E5-47AE-85FE-41B0218A8997}.Debug|ARM64.ActiveCfg = Debug|iPhone {30C91103-12E5-47AE-85FE-41B0218A8997}.Debug|iPhone.ActiveCfg = Debug|iPhone {30C91103-12E5-47AE-85FE-41B0218A8997}.Debug|iPhone.Build.0 = Debug|iPhone {30C91103-12E5-47AE-85FE-41B0218A8997}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator @@ -2269,6 +1857,7 @@ Global {30C91103-12E5-47AE-85FE-41B0218A8997}.Release|Any CPU.Build.0 = Release|iPhone {30C91103-12E5-47AE-85FE-41B0218A8997}.Release|ARM.ActiveCfg = Release|iPhoneSimulator {30C91103-12E5-47AE-85FE-41B0218A8997}.Release|ARM.Build.0 = Release|iPhoneSimulator + {30C91103-12E5-47AE-85FE-41B0218A8997}.Release|ARM64.ActiveCfg = Release|iPhone {30C91103-12E5-47AE-85FE-41B0218A8997}.Release|iPhone.ActiveCfg = Release|iPhone {30C91103-12E5-47AE-85FE-41B0218A8997}.Release|iPhone.Build.0 = Release|iPhone {30C91103-12E5-47AE-85FE-41B0218A8997}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator @@ -2277,6 +1866,118 @@ Global {30C91103-12E5-47AE-85FE-41B0218A8997}.Release|x64.Build.0 = Release|iPhoneSimulator {30C91103-12E5-47AE-85FE-41B0218A8997}.Release|x86.ActiveCfg = Release|iPhoneSimulator {30C91103-12E5-47AE-85FE-41B0218A8997}.Release|x86.Build.0 = Release|iPhoneSimulator + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Ad-Hoc|x64.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.AppStore|ARM.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.AppStore|ARM.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.AppStore|ARM64.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.AppStore|ARM64.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.AppStore|iPhone.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.AppStore|x64.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.AppStore|x64.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.AppStore|x86.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.AppStore|x86.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Debug|ARM.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Debug|ARM64.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Debug|iPhone.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Debug|x64.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Debug|x64.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Debug|x86.ActiveCfg = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Debug|x86.Build.0 = Debug|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Release|Any CPU.Build.0 = Release|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Release|ARM.ActiveCfg = Release|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Release|ARM.Build.0 = Release|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Release|ARM64.ActiveCfg = Release|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Release|ARM64.Build.0 = Release|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Release|iPhone.ActiveCfg = Release|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Release|iPhone.Build.0 = Release|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Release|x64.ActiveCfg = Release|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Release|x64.Build.0 = Release|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Release|x86.ActiveCfg = Release|Any CPU + {078B088C-FDAD-4C17-8D20-CDD17BC8897B}.Release|x86.Build.0 = Release|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Ad-Hoc|x64.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Ad-Hoc|x86.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.AppStore|ARM.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.AppStore|ARM.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.AppStore|ARM64.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.AppStore|ARM64.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.AppStore|iPhone.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.AppStore|x64.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.AppStore|x64.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.AppStore|x86.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.AppStore|x86.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Debug|ARM.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Debug|ARM.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Debug|ARM64.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Debug|iPhone.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Debug|x64.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Debug|x64.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Debug|x86.ActiveCfg = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Debug|x86.Build.0 = Debug|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Release|Any CPU.Build.0 = Release|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Release|ARM.ActiveCfg = Release|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Release|ARM.Build.0 = Release|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Release|ARM64.ActiveCfg = Release|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Release|ARM64.Build.0 = Release|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Release|iPhone.ActiveCfg = Release|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Release|iPhone.Build.0 = Release|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Release|x64.ActiveCfg = Release|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Release|x64.Build.0 = Release|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Release|x86.ActiveCfg = Release|Any CPU + {4DD5B78F-3D35-45F8-BB41-4562A36339D0}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2320,14 +2021,9 @@ Global {338E9ACF-EB26-4D5B-9ADB-B0C4588D71E1} = {C365BD30-D4E7-444A-A66D-25AAB9C67038} {1EE81B65-9B82-43B2-8C2C-4FC691F2D450} = {74FBDC58-E93A-4DCE-B83F-AA936EE57B31} {30C91103-12E5-47AE-85FE-41B0218A8997} = {1D406122-CB0D-4366-8EBC-2207EA64B7F1} - {CBFA75C9-5B10-4DF9-BC52-1559F9A664D5} = {7074DA21-91A3-4F01-B527-08DDE1EA4955} - {0CE08055-BDE9-4400-87C0-F2AEFA2161F0} = {F3C6FCAE-FB37-4FBA-8ABD-7295868F15EC} + {078B088C-FDAD-4C17-8D20-CDD17BC8897B} = {7074DA21-91A3-4F01-B527-08DDE1EA4955} + {4DD5B78F-3D35-45F8-BB41-4562A36339D0} = {7074DA21-91A3-4F01-B527-08DDE1EA4955} {6279C845-92F8-4333-AB99-3D213163593C} = {7074DA21-91A3-4F01-B527-08DDE1EA4955} - {A3518BE3-CCA9-4822-ACE9-84961DF0D1EE} = {7074DA21-91A3-4F01-B527-08DDE1EA4955} - {180F0D4F-EFB8-493F-83A6-5D15A764E9F6} = {7074DA21-91A3-4F01-B527-08DDE1EA4955} - {756C0212-8355-4B5A-8E28-FC709E4ED6C2} = {7074DA21-91A3-4F01-B527-08DDE1EA4955} - {61993DD5-15BD-4BAE-9B22-7599B9C982A6} = {7074DA21-91A3-4F01-B527-08DDE1EA4955} - {779B98DA-C513-4D3C-84B8-51474004E1F9} = {7074DA21-91A3-4F01-B527-08DDE1EA4955} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3C9A56A6-4EA3-4228-B064-E4789B282032} diff --git a/UWPUno/CSharpMath.UWPUno.SkiaSharp.Wasm/CSharpMath.UWPUno.SkiaSharp.Wasm.csproj b/UWPUno/CSharpMath.UWPUno.SkiaSharp.Wasm/CSharpMath.UWPUno.SkiaSharp.Wasm.csproj new file mode 100644 index 00000000..bccbf59b --- /dev/null +++ b/UWPUno/CSharpMath.UWPUno.SkiaSharp.Wasm/CSharpMath.UWPUno.SkiaSharp.Wasm.csproj @@ -0,0 +1,22 @@ + + + + netstandard2.0 + The SkiaSharp front end for CSharpMath on WebAssembly. + $(PackageTags) skiasharp + + + + + + + + + + + + + + + + diff --git a/CSharpMath.Uno/CSharpMath.Uno.csproj b/UWPUno/CSharpMath.UWPUno/CSharpMath.UWPUno.csproj similarity index 73% rename from CSharpMath.Uno/CSharpMath.Uno.csproj rename to UWPUno/CSharpMath.UWPUno/CSharpMath.UWPUno.csproj index d60eb0cc..70327370 100644 --- a/CSharpMath.Uno/CSharpMath.Uno.csproj +++ b/UWPUno/CSharpMath.UWPUno/CSharpMath.UWPUno.csproj @@ -3,6 +3,8 @@ netstandard2.0;xamarinios10;monoandroid90;monoandroid10.0;uap10.0.16299 + The UWP/Uno Platform front end for CSharpMath. + $(PackageTags) unoplatform uwp wasm true @@ -11,7 +13,7 @@ - + @@ -23,17 +25,14 @@ - + - + - + - - - - + \ No newline at end of file