From 0843ee21cbfd4802efefdccb06dc9fb68472a0f9 Mon Sep 17 00:00:00 2001
From: Elie Bariche <33458222+ebariche@users.noreply.github.com>
Date: Thu, 16 Jul 2020 11:49:06 -0400
Subject: [PATCH 1/3] ci(canaries): Ensure the newer samples are updated
---
.vsts-ci.canaries.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.vsts-ci.canaries.yml b/.vsts-ci.canaries.yml
index facad65c..5fbe47c5 100644
--- a/.vsts-ci.canaries.yml
+++ b/.vsts-ci.canaries.yml
@@ -1,5 +1,6 @@
steps:
- pwsh: |
+ git merge origin/master -s recursive -X theirs
$savedMSBuildExtensionsPath = $env:MSBuildExtensionsPath
$env:MSBuildExtensionsPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild'
dotnet new sln --name=Uno.Samples.generated
@@ -16,8 +17,7 @@ steps:
solution: Uno.Samples.generated.sln
usePrivateFeed: false
useNuGetOrg: true
- mergeBranch: true
- branchToMerge: 'master'
+ mergeBranch: false
nugetUpdaterVersion: '2.1.1'
allowDowngrade: true
packageAuthor: 'nventive'
From 01aa696dac124de377ca2f42981be5ea29de0ef9 Mon Sep 17 00:00:00 2001
From: Elie Bariche <33458222+ebariche@users.noreply.github.com>
Date: Thu, 16 Jul 2020 12:00:47 -0400
Subject: [PATCH 2/3] fix(android): Use newer NativeApplication ctor
---
.../AndroidCustomCamera/AndroidCustomCamera.Droid/Main.cs | 2 +-
.../AutoSuggestSample/AutoSuggestSample.Droid/Main.cs | 2 +-
.../CameraCaptureUISample/CameraCaptureUISample.Droid/Main.cs | 2 +-
UI/ControlLibrary/Apps/App.ControlLibrary.Droid/Main.cs | 2 +-
.../MapControlSample/MapControlSample.Droid/Main.cs | 2 +-
UI/SkiaSharpTest/SkiaSharpTest/SkiaSharpTest.Droid/Main.cs | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/UI/AndroidCustomCamera/AndroidCustomCamera/AndroidCustomCamera.Droid/Main.cs b/UI/AndroidCustomCamera/AndroidCustomCamera/AndroidCustomCamera.Droid/Main.cs
index d30041e8..a009344f 100644
--- a/UI/AndroidCustomCamera/AndroidCustomCamera/AndroidCustomCamera.Droid/Main.cs
+++ b/UI/AndroidCustomCamera/AndroidCustomCamera/AndroidCustomCamera.Droid/Main.cs
@@ -23,7 +23,7 @@ namespace AndroidCustomCamera.Droid
public class Application : Windows.UI.Xaml.NativeApplication
{
public Application(IntPtr javaReference, JniHandleOwnership transfer)
- : base(new App(), javaReference, transfer)
+ : base(() => new App(), javaReference, transfer)
{
ConfigureUniversalImageLoader();
}
diff --git a/UI/AutoSuggestSample/AutoSuggestSample/AutoSuggestSample.Droid/Main.cs b/UI/AutoSuggestSample/AutoSuggestSample/AutoSuggestSample.Droid/Main.cs
index 8eedddc5..b08872b6 100644
--- a/UI/AutoSuggestSample/AutoSuggestSample/AutoSuggestSample.Droid/Main.cs
+++ b/UI/AutoSuggestSample/AutoSuggestSample/AutoSuggestSample.Droid/Main.cs
@@ -21,7 +21,7 @@ namespace AutoSuggestSample.Droid
public class Application : Windows.UI.Xaml.NativeApplication
{
public Application(IntPtr javaReference, JniHandleOwnership transfer)
- : base(new App(), javaReference, transfer)
+ : base(() => new App(), javaReference, transfer)
{
}
}
diff --git a/UI/CameraCaptureUI/CameraCaptureUISample/CameraCaptureUISample.Droid/Main.cs b/UI/CameraCaptureUI/CameraCaptureUISample/CameraCaptureUISample.Droid/Main.cs
index 3eb00766..89d79a51 100644
--- a/UI/CameraCaptureUI/CameraCaptureUISample/CameraCaptureUISample.Droid/Main.cs
+++ b/UI/CameraCaptureUI/CameraCaptureUISample/CameraCaptureUISample.Droid/Main.cs
@@ -23,7 +23,7 @@ namespace CameraCaptureUISample.Droid
public class Application : Windows.UI.Xaml.NativeApplication
{
public Application(IntPtr javaReference, JniHandleOwnership transfer)
- : base(new App(), javaReference, transfer)
+ : base(() => new App(), javaReference, transfer)
{
ConfigureUniversalImageLoader();
}
diff --git a/UI/ControlLibrary/Apps/App.ControlLibrary.Droid/Main.cs b/UI/ControlLibrary/Apps/App.ControlLibrary.Droid/Main.cs
index a613c603..0d394f99 100644
--- a/UI/ControlLibrary/Apps/App.ControlLibrary.Droid/Main.cs
+++ b/UI/ControlLibrary/Apps/App.ControlLibrary.Droid/Main.cs
@@ -21,7 +21,7 @@ namespace Uno.Sample.ControlLibrary.Droid
public class Application : Windows.UI.Xaml.NativeApplication
{
public Application(IntPtr javaReference, JniHandleOwnership transfer)
- : base(new App(), javaReference, transfer)
+ : base(() => new App(), javaReference, transfer)
{
}
}
diff --git a/UI/MapControlSample/MapControlSample/MapControlSample.Droid/Main.cs b/UI/MapControlSample/MapControlSample/MapControlSample.Droid/Main.cs
index 5230b99c..2247cb8b 100644
--- a/UI/MapControlSample/MapControlSample/MapControlSample.Droid/Main.cs
+++ b/UI/MapControlSample/MapControlSample/MapControlSample.Droid/Main.cs
@@ -23,7 +23,7 @@ namespace MapControlSample.Droid
public class Application : Windows.UI.Xaml.NativeApplication
{
public Application(IntPtr javaReference, JniHandleOwnership transfer)
- : base(new App(), javaReference, transfer)
+ : base(() => new App(), javaReference, transfer)
{
ConfigureUniversalImageLoader();
}
diff --git a/UI/SkiaSharpTest/SkiaSharpTest/SkiaSharpTest.Droid/Main.cs b/UI/SkiaSharpTest/SkiaSharpTest/SkiaSharpTest.Droid/Main.cs
index a6a2ca8c..9ac6f7ff 100644
--- a/UI/SkiaSharpTest/SkiaSharpTest/SkiaSharpTest.Droid/Main.cs
+++ b/UI/SkiaSharpTest/SkiaSharpTest/SkiaSharpTest.Droid/Main.cs
@@ -23,7 +23,7 @@ namespace SkiaSharpTest.Droid
public class Application : Windows.UI.Xaml.NativeApplication
{
public Application(IntPtr javaReference, JniHandleOwnership transfer)
- : base(new App(), javaReference, transfer)
+ : base(() => new App(), javaReference, transfer)
{
ConfigureUniversalImageLoader();
}
From 59cbd0423f30e78a21f7acd45fd70a1dcab19ae6 Mon Sep 17 00:00:00 2001
From: Elie Bariche <33458222+ebariche@users.noreply.github.com>
Date: Thu, 16 Jul 2020 15:50:43 -0400
Subject: [PATCH 3/3] feat: Update MapControlSample
---
.../MapControlSample.Droid.csproj | 14 ++++++--------
.../Properties/AndroidManifest.xml | 4 ++--
.../MapControlSample.Wasm.csproj | 4 ++--
.../MapControlSample.iOS.csproj | 4 ++--
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/UI/MapControlSample/MapControlSample/MapControlSample.Droid/MapControlSample.Droid.csproj b/UI/MapControlSample/MapControlSample/MapControlSample.Droid/MapControlSample.Droid.csproj
index 0fd63c5b..fe0a4328 100644
--- a/UI/MapControlSample/MapControlSample/MapControlSample.Droid/MapControlSample.Droid.csproj
+++ b/UI/MapControlSample/MapControlSample/MapControlSample.Droid/MapControlSample.Droid.csproj
@@ -16,7 +16,7 @@
Resources\Resource.Designer.cs
Off
False
- v9.0
+ v10.0
Properties\AndroidManifest.xml
True
..\MapControlSample.Shared\Strings
@@ -52,16 +52,14 @@
-
- ..\..\..\..\..\uno\src\Uno.UI.Maps.Android\bin\Debug\MonoAndroid80\Uno.UI.Maps.Android.dll
-
-
-
- 2.3.0-dev.80
+
+
+
+
+ 2.1.0.1
-
diff --git a/UI/MapControlSample/MapControlSample/MapControlSample.Droid/Properties/AndroidManifest.xml b/UI/MapControlSample/MapControlSample/MapControlSample.Droid/Properties/AndroidManifest.xml
index bc3a02f9..b506a5e3 100644
--- a/UI/MapControlSample/MapControlSample/MapControlSample.Droid/Properties/AndroidManifest.xml
+++ b/UI/MapControlSample/MapControlSample/MapControlSample.Droid/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/UI/MapControlSample/MapControlSample/MapControlSample.Wasm/MapControlSample.Wasm.csproj b/UI/MapControlSample/MapControlSample/MapControlSample.Wasm/MapControlSample.Wasm.csproj
index 221fa2ff..8cbf17aa 100644
--- a/UI/MapControlSample/MapControlSample/MapControlSample.Wasm/MapControlSample.Wasm.csproj
+++ b/UI/MapControlSample/MapControlSample/MapControlSample.Wasm/MapControlSample.Wasm.csproj
@@ -30,8 +30,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/UI/MapControlSample/MapControlSample/MapControlSample.iOS/MapControlSample.iOS.csproj b/UI/MapControlSample/MapControlSample/MapControlSample.iOS/MapControlSample.iOS.csproj
index 0e658d53..043b8e1e 100644
--- a/UI/MapControlSample/MapControlSample/MapControlSample.iOS/MapControlSample.iOS.csproj
+++ b/UI/MapControlSample/MapControlSample/MapControlSample.iOS/MapControlSample.iOS.csproj
@@ -99,9 +99,9 @@
-
+
- 2.3.0-dev.80
+ 2.4.4