From adb7e06e787ebf283c221461b6727e885b7f2fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Fri, 24 May 2019 14:08:14 -0400 Subject: [PATCH 1/7] Update Wasm bootstrapper, add defaut --- src/Calculator.Wasm/Calculator.Wasm.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Calculator.Wasm/Calculator.Wasm.csproj b/src/Calculator.Wasm/Calculator.Wasm.csproj index dbc79693..77f13551 100644 --- a/src/Calculator.Wasm/Calculator.Wasm.csproj +++ b/src/Calculator.Wasm/Calculator.Wasm.csproj @@ -37,7 +37,7 @@ - + From 361503e4ef482855acb434b84d7468b90a7c9c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Fri, 24 May 2019 14:41:47 -0400 Subject: [PATCH 2/7] Use android NDK r19c --- .vsts-ci.Windows.yml | 3 +++ .../CalcManager.Android.vcxproj | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.vsts-ci.Windows.yml b/.vsts-ci.Windows.yml index 6cc06371..5e0fd618 100644 --- a/.vsts-ci.Windows.yml +++ b/.vsts-ci.Windows.yml @@ -4,6 +4,9 @@ jobs: pool: vmImage: 'windows-2019' + variables: + NDK_ROOT: C:\Microsoft\AndroidNDK64\android-ndk-r19c + steps: - task: GitVersion@4 inputs: diff --git a/src/CalcManager.Android/CalcManager.Android.vcxproj b/src/CalcManager.Android/CalcManager.Android.vcxproj index 9b9c131e..dd55a9db 100644 --- a/src/CalcManager.Android/CalcManager.Android.vcxproj +++ b/src/CalcManager.Android/CalcManager.Android.vcxproj @@ -105,49 +105,49 @@ DynamicLibrary true Clang_5_0 - android-27 + android-21 DynamicLibrary false Clang_5_0 - android-27 + android-21 DynamicLibrary true Clang_5_0 - android-27 + android-21 DynamicLibrary false Clang_5_0 - android-27 + android-21 DynamicLibrary true Clang_5_0 - android-27 + android-21 DynamicLibrary false Clang_5_0 - android-27 + android-21 DynamicLibrary true Clang_5_0 - android-27 + android-21 DynamicLibrary false Clang_5_0 - android-27 + android-21 From a08c37d1bee2052c23586131b0c2da19bfffdf90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Fri, 24 May 2019 15:24:00 -0400 Subject: [PATCH 3/7] Add missing strtod_l --- .../CalcManager.Android.vcxproj | 1 + .../CalcManager.Android.vcxproj.filters | 1 + src/CalcManager.Android/Source.cpp | 23 +++++++++++++++++++ src/CalcManager.Android/strto_workaround.cpp | 21 +++++++++++++++++ 4 files changed, 46 insertions(+) create mode 100644 src/CalcManager.Android/Source.cpp create mode 100644 src/CalcManager.Android/strto_workaround.cpp diff --git a/src/CalcManager.Android/CalcManager.Android.vcxproj b/src/CalcManager.Android/CalcManager.Android.vcxproj index dd55a9db..aaaa423c 100644 --- a/src/CalcManager.Android/CalcManager.Android.vcxproj +++ b/src/CalcManager.Android/CalcManager.Android.vcxproj @@ -64,6 +64,7 @@ + diff --git a/src/CalcManager.Android/CalcManager.Android.vcxproj.filters b/src/CalcManager.Android/CalcManager.Android.vcxproj.filters index fba4455c..40dcf476 100644 --- a/src/CalcManager.Android/CalcManager.Android.vcxproj.filters +++ b/src/CalcManager.Android/CalcManager.Android.vcxproj.filters @@ -41,6 +41,7 @@ + diff --git a/src/CalcManager.Android/Source.cpp b/src/CalcManager.Android/Source.cpp new file mode 100644 index 00000000..ce079f01 --- /dev/null +++ b/src/CalcManager.Android/Source.cpp @@ -0,0 +1,23 @@ +#include + +// see https://github.com/aosp-mirror/platform_bionic/commit/3103f6d39e4ae309a9374ee38f414400c889c558#diff-71865bddb52592934317bb2340a94b0cR199 + +double strtod_l(const char* s, char** end_ptr, locale_t) +{ + return strtod(s, end_ptr); +} + +float strtof_l(const char* s, char** end_ptr, locale_t) +{ + return strtof(s, end_ptr); +} + +long strtol_l(const char* s, char** end_ptr, int base, locale_t) +{ + return strtol(s, end_ptr, base); +} + +unsigned long strtoul_l(const char* s, char** end_ptr, int base, locale_t) +{ + return strtoul(s, end_ptr, base); +} diff --git a/src/CalcManager.Android/strto_workaround.cpp b/src/CalcManager.Android/strto_workaround.cpp new file mode 100644 index 00000000..1e927c84 --- /dev/null +++ b/src/CalcManager.Android/strto_workaround.cpp @@ -0,0 +1,21 @@ +#include + +double strtod_l(const char* s, char** end_ptr, locale_t) +{ + return strtod(s, end_ptr); +} + +float strtof_l(const char* s, char** end_ptr, locale_t) +{ + return strtof(s, end_ptr); +} + +long strtol_l(const char* s, char** end_ptr, int base, locale_t) +{ + return strtol(s, end_ptr, base); +} + +unsigned long strtoul_l(const char* s, char** end_ptr, int base, locale_t) +{ + return strtoul(s, end_ptr, base); +} From 56851f7b8a2076f05f2cc4526811542242473426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Fri, 24 May 2019 20:30:25 -0400 Subject: [PATCH 4/7] Disable signing for non-CI builds --- src/Calculator.Droid/Calculator.Droid.csproj | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Calculator.Droid/Calculator.Droid.csproj b/src/Calculator.Droid/Calculator.Droid.csproj index 982c288c..77f93a73 100644 --- a/src/Calculator.Droid/Calculator.Droid.csproj +++ b/src/Calculator.Droid/Calculator.Droid.csproj @@ -21,7 +21,7 @@ True ..\Calculator.Shared\Strings 7.3 - true + false calc-prod.keystore calc-prod @@ -65,7 +65,9 @@ - + + + Properties\AssemblyVersion.Android.cs @@ -114,4 +116,4 @@ --> - \ No newline at end of file + From 6ec5d20fb28e35c8bc73536045b33706c824c532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Fri, 24 May 2019 20:30:46 -0400 Subject: [PATCH 5/7] Disable logging for wasm release, share logging for Uno --- src/Calculator.Shared/App.xaml.cs | 54 ++++++++++++++++++++-- src/Calculator.Wasm/Calculator.Wasm.csproj | 7 +++ src/Calculator.Wasm/Program.cs | 38 --------------- src/Calculator.iOS/Calculator.iOS.csproj | 6 ++- 4 files changed, 61 insertions(+), 44 deletions(-) diff --git a/src/Calculator.Shared/App.xaml.cs b/src/Calculator.Shared/App.xaml.cs index bf38c091..17dff6c9 100644 --- a/src/Calculator.Shared/App.xaml.cs +++ b/src/Calculator.Shared/App.xaml.cs @@ -34,6 +34,10 @@ namespace CalculatorApp /// public App() { +#if HAS_UNO + ConfigureFilters(Uno.Extensions.LogExtensionPoint.AmbientLoggerFactory); +#endif + this.InitializeComponent(); this.Suspending += OnSuspending; } @@ -91,10 +95,52 @@ namespace CalculatorApp } } - /// - /// Return True if animation is enabled by user setting. - /// - public static bool IsAnimationEnabled() +#if HAS_UNO + static void ConfigureFilters(Microsoft.Extensions.Logging.ILoggerFactory factory) + { +#if DEBUG + factory + .WithFilter(new Microsoft.Extensions.Logging.FilterLoggerSettings + { + { "Uno", LogLevel.Warning }, + { "Windows", LogLevel.Warning }, + + // Generic Xaml events + //{ "Windows.UI.Xaml", LogLevel.Debug }, + // { "Windows.UI.Xaml.Shapes", LogLevel.Debug }, + //{ "Windows.UI.Xaml.VisualStateGroup", LogLevel.Debug }, + //{ "Windows.UI.Xaml.StateTriggerBase", LogLevel.Debug }, + // { "Windows.UI.Xaml.UIElement", LogLevel.Debug }, + // { "Windows.UI.Xaml.Setter", 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 }, + + // Binding related messages + // { "Windows.UI.Xaml.Data", LogLevel.Debug }, + // { "Windows.UI.Xamll.Data", LogLevel.Debug }, + + // Binder memory references tracking + // { "ReferenceHolder", LogLevel.Debug }, + } + ) + .AddConsole(LogLevel.Trace); +#else +#if !__WASM__ + factory + .AddConsole(LogLevel.Error); +#endifs +#endif + } +#endif + + + /// + /// Return True if animation is enabled by user setting. + /// + public static bool IsAnimationEnabled() { return m_isAnimationEnabled; } diff --git a/src/Calculator.Wasm/Calculator.Wasm.csproj b/src/Calculator.Wasm/Calculator.Wasm.csproj index 77f13551..9a295d9f 100644 --- a/src/Calculator.Wasm/Calculator.Wasm.csproj +++ b/src/Calculator.Wasm/Calculator.Wasm.csproj @@ -33,6 +33,13 @@ + + + + + + + diff --git a/src/Calculator.Wasm/Program.cs b/src/Calculator.Wasm/Program.cs index 40b01b4c..f6e3e9b9 100644 --- a/src/Calculator.Wasm/Program.cs +++ b/src/Calculator.Wasm/Program.cs @@ -14,45 +14,7 @@ namespace WindowsCalculator.Wasm { Console.WriteLine("Program.Main"); - ConfigureFilters(LogExtensionPoint.AmbientLoggerFactory); - Windows.UI.Xaml.Application.Start(_ => _app = new App()); } - static void ConfigureFilters(ILoggerFactory factory) - { -#if DEBUG - factory - .WithFilter(new FilterLoggerSettings - { - { "Uno", LogLevel.Warning }, - { "Windows", LogLevel.Warning }, - - // Generic Xaml events - //{ "Windows.UI.Xaml", LogLevel.Debug }, - // { "Windows.UI.Xaml.Shapes", LogLevel.Debug }, - //{ "Windows.UI.Xaml.VisualStateGroup", LogLevel.Debug }, - //{ "Windows.UI.Xaml.StateTriggerBase", LogLevel.Debug }, - // { "Windows.UI.Xaml.UIElement", LogLevel.Debug }, - // { "Windows.UI.Xaml.Setter", 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 }, - - // Binding related messages - // { "Windows.UI.Xaml.Data", LogLevel.Debug }, - // { "Windows.UI.Xamll.Data", LogLevel.Debug }, - - // Binder memory references tracking - // { "ReferenceHolder", LogLevel.Debug }, - } - ) - .AddConsole(LogLevel.Trace); -#else - factory - .AddConsole(LogLevel.Error); -#endif - } } } diff --git a/src/Calculator.iOS/Calculator.iOS.csproj b/src/Calculator.iOS/Calculator.iOS.csproj index ce4e5ae5..9cbedb92 100644 --- a/src/Calculator.iOS/Calculator.iOS.csproj +++ b/src/Calculator.iOS/Calculator.iOS.csproj @@ -191,7 +191,9 @@ - + + + Static @@ -204,4 +206,4 @@ - \ No newline at end of file + From 945e4873c5186d504474795feffcd3423e35fd5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Fri, 24 May 2019 20:32:20 -0400 Subject: [PATCH 6/7] remove unused ndk --- .vsts-ci.Windows.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.vsts-ci.Windows.yml b/.vsts-ci.Windows.yml index 5e0fd618..6cc06371 100644 --- a/.vsts-ci.Windows.yml +++ b/.vsts-ci.Windows.yml @@ -4,9 +4,6 @@ jobs: pool: vmImage: 'windows-2019' - variables: - NDK_ROOT: C:\Microsoft\AndroidNDK64\android-ndk-r19c - steps: - task: GitVersion@4 inputs: From c0787bfe7a2a9f0b1634ffecedb08a0e5638bf48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Fri, 24 May 2019 20:40:07 -0400 Subject: [PATCH 7/7] Update exclusions --- src/Calculator.Shared/App.xaml.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Calculator.Shared/App.xaml.cs b/src/Calculator.Shared/App.xaml.cs index 17dff6c9..8d775b5b 100644 --- a/src/Calculator.Shared/App.xaml.cs +++ b/src/Calculator.Shared/App.xaml.cs @@ -19,6 +19,10 @@ using Windows.UI.Xaml.Input; using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Navigation; +#if HAS_UNO +using Microsoft.Extensions.Logging; +#endif + namespace CalculatorApp { /// @@ -96,11 +100,11 @@ namespace CalculatorApp } #if HAS_UNO - static void ConfigureFilters(Microsoft.Extensions.Logging.ILoggerFactory factory) + static void ConfigureFilters(ILoggerFactory factory) { #if DEBUG factory - .WithFilter(new Microsoft.Extensions.Logging.FilterLoggerSettings + .WithFilter(new FilterLoggerSettings { { "Uno", LogLevel.Warning }, { "Windows", LogLevel.Warning }, @@ -131,7 +135,7 @@ namespace CalculatorApp #if !__WASM__ factory .AddConsole(LogLevel.Error); -#endifs +#endif #endif } #endif