Merge pull request #18 from unoplatform/dev/eb/canaries

feat: Update dev canary
2020-07-22 15:29:02 -04:00 · 2020-07-22 15:29:02 -04:00 · 58b2672273
--- 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'
--- 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();
 		}
--- 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)
 		{
 		}
 	}
--- 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();
 		}
--- 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)
 		{
 		}
 	}
--- 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();
 		}
--- a/UI/MapControlSample/MapControlSample/MapControlSample.Droid/MapControlSample.Droid.csproj
+++ b/UI/MapControlSample/MapControlSample/MapControlSample.Droid/MapControlSample.Droid.csproj
@ -16,7 +16,7 @@
    <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
    <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
    <AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
    <ResourcesDirectory>..\MapControlSample.Shared\Strings</ResourcesDirectory>
@ -52,16 +52,14 @@
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Xml" />
-    <Reference Include="Uno.UI.Maps.Android">
-      <HintPath>..\..\..\..\..\uno\src\Uno.UI.Maps.Android\bin\Debug\MonoAndroid80\Uno.UI.Maps.Android.dll</HintPath>
-    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="2.3.0-dev.80" />
-    <PackageReference Include="Uno.UI.Maps">
-      <Version>2.3.0-dev.80</Version>
+    <PackageReference Include="Uno.UI" Version="2.4.4" />
+    <PackageReference Include="Uno.UI.Maps" Version="2.4.4" />
+    <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
+      <Version>2.1.0.1</Version>
    </PackageReference>
-    <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.31" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="MainActivity.cs" />
--- a/UI/MapControlSample/MapControlSample/MapControlSample.Droid/Properties/AndroidManifest.xml
+++ b/UI/MapControlSample/MapControlSample/MapControlSample.Droid/Properties/AndroidManifest.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="MapControlSample" android:versionCode="1" android:versionName="1.0">
-	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="MapControlSample.MapControlSample" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
+	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="29" />
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 	<application android:label="MapControlSample"></application>
 </manifest>
--- a/UI/MapControlSample/MapControlSample/MapControlSample.Wasm/MapControlSample.Wasm.csproj
+++ b/UI/MapControlSample/MapControlSample/MapControlSample.Wasm/MapControlSample.Wasm.csproj
@ -30,8 +30,8 @@
    <Content Include="LinkerConfig.xml" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="2.3.0-dev.80" />
-    <PackageReference Include="Uno.Wasm.Bootstrap" Version="1.2.0-dev.29" />
+    <PackageReference Include="Uno.UI" Version="2.4.4" />
+    <PackageReference Include="Uno.Wasm.Bootstrap" Version="1.3.0" />
  </ItemGroup>
  <Import Project="..\MapControlSample.Shared\MapControlSample.Shared.projitems" Label="Shared" Condition="Exists('..\MapControlSample.Shared\MapControlSample.Shared.projitems')" />
 </Project>
--- a/UI/MapControlSample/MapControlSample/MapControlSample.iOS/MapControlSample.iOS.csproj
+++ b/UI/MapControlSample/MapControlSample/MapControlSample.iOS/MapControlSample.iOS.csproj
@ -99,9 +99,9 @@
    <Reference Include="Xamarin.iOS" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="2.3.0-dev.80" />
+    <PackageReference Include="Uno.UI" Version="2.4.4" />
    <PackageReference Include="Uno.UI.Maps">
-      <Version>2.3.0-dev.80</Version>
+      <Version>2.4.4</Version>
    </PackageReference>
  </ItemGroup>
  <Import Project="..\MapControlSample.Shared\MapControlSample.Shared.projitems" Label="Shared" Condition="Exists('..\MapControlSample.Shared\MapControlSample.Shared.projitems')" />
--- 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();
        }