From 9dd61473c7b2e5e57ed53f7bec50afe8c094e707 Mon Sep 17 00:00:00 2001
From: David Oliver <david.oliver@nventive.com>
Date: Mon, 4 May 2020 21:06:22 -0400
Subject: [PATCH 1/3] fix: [Android] Use newer NativeActivity constructor

---
 src/Uno.AzureDevOps/Uno.AzureDevOps.Droid/Main.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Uno.AzureDevOps/Uno.AzureDevOps.Droid/Main.cs b/src/Uno.AzureDevOps/Uno.AzureDevOps.Droid/Main.cs
index b2d3c83..454a008 100644
--- a/src/Uno.AzureDevOps/Uno.AzureDevOps.Droid/Main.cs
+++ b/src/Uno.AzureDevOps/Uno.AzureDevOps.Droid/Main.cs
@@ -23,7 +23,7 @@ namespace Uno.AzureDevOps.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 aee26f0f0f55554d9acd9e4d084ffeb80fc791db Mon Sep 17 00:00:00 2001
From: David Oliver <david.oliver@nventive.com>
Date: Thu, 4 Jun 2020 21:02:14 -0400
Subject: [PATCH 2/3] chore: Update to latest version of Uno (Styles rework,
 AndroidX)

---
 .../Uno.AzureDevOps.Droid/Uno.AzureDevOps.Droid.csproj    | 8 +++++---
 .../Uno.AzureDevOps.UWP/Uno.AzureDevOps.UWP.csproj        | 4 ++--
 .../Uno.AzureDevOps.Wasm/Uno.AzureDevOps.Wasm.csproj      | 6 +++---
 .../Uno.AzureDevOps.iOS/Uno.AzureDevOps.iOS.csproj        | 4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Uno.AzureDevOps/Uno.AzureDevOps.Droid/Uno.AzureDevOps.Droid.csproj b/src/Uno.AzureDevOps/Uno.AzureDevOps.Droid/Uno.AzureDevOps.Droid.csproj
index cdbd048..9593ddf 100644
--- a/src/Uno.AzureDevOps/Uno.AzureDevOps.Droid/Uno.AzureDevOps.Droid.csproj
+++ b/src/Uno.AzureDevOps/Uno.AzureDevOps.Droid/Uno.AzureDevOps.Droid.csproj
@@ -97,16 +97,18 @@
       <Version>1.1.1</Version>
     </PackageReference>
     <PackageReference Include="Uno.Core">
-      <Version>1.28.0</Version>
+      <Version>2.0.0</Version>
     </PackageReference>
     <PackageReference Include="Uno.GalaSoft.MvvmLight.Platform">
       <Version>5.4.0-uno.134</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI" Version="1.45.0-dev.1813" />
+    <PackageReference Include="Uno.UI" Version="3.0.0-dev.405" />
     <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" />
     <PackageReference Include="Xamarin.Essentials">
-      <Version>1.1.0</Version>
+      <Version>1.5.3.1</Version>
     </PackageReference>
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0" />
+    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
diff --git a/src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/Uno.AzureDevOps.UWP.csproj b/src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/Uno.AzureDevOps.UWP.csproj
index 9b0c3fc..06de386 100644
--- a/src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/Uno.AzureDevOps.UWP.csproj
+++ b/src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/Uno.AzureDevOps.UWP.csproj
@@ -30,13 +30,13 @@
       <Version>6.2.2</Version>
     </PackageReference>
     <PackageReference Include="Uno.Core">
-      <Version>1.28.0</Version>
+      <Version>2.0.0</Version>
     </PackageReference>
     <PackageReference Include="Uno.GalaSoft.MvvmLight.Platform">
       <Version>5.4.0-uno.134</Version>
     </PackageReference>
     <PackageReference Include="Uno.UI">
-      <Version>1.45.0-dev.1813</Version>
+      <Version>3.0.0-dev.405</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Essentials">
       <Version>1.1.0</Version>
diff --git a/src/Uno.AzureDevOps/Uno.AzureDevOps.Wasm/Uno.AzureDevOps.Wasm.csproj b/src/Uno.AzureDevOps/Uno.AzureDevOps.Wasm/Uno.AzureDevOps.Wasm.csproj
index 7aa0a6a..0f84e4c 100644
--- a/src/Uno.AzureDevOps/Uno.AzureDevOps.Wasm/Uno.AzureDevOps.Wasm.csproj
+++ b/src/Uno.AzureDevOps/Uno.AzureDevOps.Wasm/Uno.AzureDevOps.Wasm.csproj
@@ -87,9 +87,9 @@
 	  <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 	</PackageReference>
 	<PackageReference Include="Uno.GalaSoft.MvvmLight.Platform" Version="5.4.0-uno.134" />
-	<PackageReference Include="Uno.UI" Version="1.45.0-dev.1813" />
-	<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.265" />
-	<DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.0.0-dev.265" />
+	<PackageReference Include="Uno.UI" Version="3.0.0-dev.405" />
+	<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.3.0-dev.18" />
+	<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.3.0-dev.18" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Fonts\NunitoSans-SemiBoldItalic.woff2" />
diff --git a/src/Uno.AzureDevOps/Uno.AzureDevOps.iOS/Uno.AzureDevOps.iOS.csproj b/src/Uno.AzureDevOps/Uno.AzureDevOps.iOS/Uno.AzureDevOps.iOS.csproj
index 2f8c32c..b0a7e34 100644
--- a/src/Uno.AzureDevOps/Uno.AzureDevOps.iOS/Uno.AzureDevOps.iOS.csproj
+++ b/src/Uno.AzureDevOps/Uno.AzureDevOps.iOS/Uno.AzureDevOps.iOS.csproj
@@ -177,12 +177,12 @@
       <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="Uno.Core">
-      <Version>1.28.0</Version>
+      <Version>2.0.0</Version>
     </PackageReference>
     <PackageReference Include="Uno.GalaSoft.MvvmLight.Platform">
       <Version>5.4.0-uno.134</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI" Version="1.45.0-dev.1813" />
+    <PackageReference Include="Uno.UI" Version="3.0.0-dev.405" />
     <PackageReference Include="Xamarin.Essentials">
       <Version>1.1.0</Version>
     </PackageReference>

From 2bf2c776bcc938a9a32e137ba22ed3fa99c7c3f6 Mon Sep 17 00:00:00 2001
From: David Oliver <david.oliver@nventive.com>
Date: Thu, 4 Jun 2020 21:02:51 -0400
Subject: [PATCH 3/3] chore: Remove temporary files from source control

---
 ...Uno.AzureDevOps.UWP.csproj.nuget.g.targets | 24 -------------------
 .../Debug/Styles/Application/Colors.g.i.cs    |  1 -
 .../Styles/Application/Converters.g.i.cs      |  1 -
 ...no.AzureDevOps.Wasm.csproj.nuget.g.targets | 14 -----------
 ...Uno.AzureDevOps.iOS.csproj.nuget.g.targets | 11 ---------
 5 files changed, 51 deletions(-)
 delete mode 100644 src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/obj/Uno.AzureDevOps.UWP.csproj.nuget.g.targets
 delete mode 100644 src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/obj/x86/Debug/Styles/Application/Colors.g.i.cs
 delete mode 100644 src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/obj/x86/Debug/Styles/Application/Converters.g.i.cs
 delete mode 100644 src/Uno.AzureDevOps/Uno.AzureDevOps.Wasm/obj/Uno.AzureDevOps.Wasm.csproj.nuget.g.targets
 delete mode 100644 src/Uno.AzureDevOps/Uno.AzureDevOps.iOS/obj/Uno.AzureDevOps.iOS.csproj.nuget.g.targets

diff --git a/src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/obj/Uno.AzureDevOps.UWP.csproj.nuget.g.targets b/src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/obj/Uno.AzureDevOps.UWP.csproj.nuget.g.targets
deleted file mode 100644
index 5c51a0b..0000000
--- a/src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/obj/Uno.AzureDevOps.UWP.csproj.nuget.g.targets
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)runtime.win10-x86.microsoft.net.uwpcoreruntimesdk\2.2.2\build\runtime.win10-x86.Microsoft.Net.UWPCoreRuntimeSdk.targets" Condition="Exists('$(NuGetPackageRoot)runtime.win10-x86.microsoft.net.uwpcoreruntimesdk\2.2.2\build\runtime.win10-x86.Microsoft.Net.UWPCoreRuntimeSdk.targets')" />
-    <Import Project="$(NuGetPackageRoot)runtime.win10-x86.microsoft.net.native.sharedlibrary\2.2.1\build\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary.targets" Condition="Exists('$(NuGetPackageRoot)runtime.win10-x86.microsoft.net.native.sharedlibrary\2.2.1\build\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary.targets')" />
-    <Import Project="$(NuGetPackageRoot)runtime.win10-x86.microsoft.net.native.compiler\2.2.1\build\runtime.win10-x86.Microsoft.Net.Native.Compiler.targets" Condition="Exists('$(NuGetPackageRoot)runtime.win10-x86.microsoft.net.native.compiler\2.2.1\build\runtime.win10-x86.Microsoft.Net.Native.Compiler.targets')" />
-    <Import Project="$(NuGetPackageRoot)runtime.win10-x64.microsoft.net.uwpcoreruntimesdk\2.2.2\build\runtime.win10-x64.Microsoft.Net.UWPCoreRuntimeSdk.targets" Condition="Exists('$(NuGetPackageRoot)runtime.win10-x64.microsoft.net.uwpcoreruntimesdk\2.2.2\build\runtime.win10-x64.Microsoft.Net.UWPCoreRuntimeSdk.targets')" />
-    <Import Project="$(NuGetPackageRoot)runtime.win10-x64.microsoft.net.native.sharedlibrary\2.2.1\build\runtime.win10-x64.Microsoft.Net.Native.SharedLibrary.targets" Condition="Exists('$(NuGetPackageRoot)runtime.win10-x64.microsoft.net.native.sharedlibrary\2.2.1\build\runtime.win10-x64.Microsoft.Net.Native.SharedLibrary.targets')" />
-    <Import Project="$(NuGetPackageRoot)runtime.win10-x64.microsoft.net.native.compiler\2.2.1\build\runtime.win10-x64.Microsoft.Net.Native.Compiler.targets" Condition="Exists('$(NuGetPackageRoot)runtime.win10-x64.microsoft.net.native.compiler\2.2.1\build\runtime.win10-x64.Microsoft.Net.Native.Compiler.targets')" />
-    <Import Project="$(NuGetPackageRoot)runtime.win10-arm64.microsoft.net.native.sharedlibrary\2.2.1\build\runtime.win10-arm64.Microsoft.Net.Native.SharedLibrary.targets" Condition="Exists('$(NuGetPackageRoot)runtime.win10-arm64.microsoft.net.native.sharedlibrary\2.2.1\build\runtime.win10-arm64.Microsoft.Net.Native.SharedLibrary.targets')" />
-    <Import Project="$(NuGetPackageRoot)runtime.win10-arm64.microsoft.net.native.compiler\2.2.1\build\runtime.win10-arm64.Microsoft.Net.Native.Compiler.targets" Condition="Exists('$(NuGetPackageRoot)runtime.win10-arm64.microsoft.net.native.compiler\2.2.1\build\runtime.win10-arm64.Microsoft.Net.Native.Compiler.targets')" />
-    <Import Project="$(NuGetPackageRoot)runtime.win10-arm.microsoft.net.uwpcoreruntimesdk\2.2.2\build\runtime.win10-arm.Microsoft.Net.UWPCoreRuntimeSdk.targets" Condition="Exists('$(NuGetPackageRoot)runtime.win10-arm.microsoft.net.uwpcoreruntimesdk\2.2.2\build\runtime.win10-arm.Microsoft.Net.UWPCoreRuntimeSdk.targets')" />
-    <Import Project="$(NuGetPackageRoot)runtime.win10-arm.microsoft.net.native.sharedlibrary\2.2.1\build\runtime.win10-arm.Microsoft.Net.Native.SharedLibrary.targets" Condition="Exists('$(NuGetPackageRoot)runtime.win10-arm.microsoft.net.native.sharedlibrary\2.2.1\build\runtime.win10-arm.Microsoft.Net.Native.SharedLibrary.targets')" />
-    <Import Project="$(NuGetPackageRoot)runtime.win10-arm.microsoft.net.native.compiler\2.2.1\build\runtime.win10-arm.Microsoft.Net.Native.Compiler.targets" Condition="Exists('$(NuGetPackageRoot)runtime.win10-arm.microsoft.net.native.compiler\2.2.1\build\runtime.win10-arm.Microsoft.Net.Native.Compiler.targets')" />
-    <Import Project="C:\Program Files (x86)\Microsoft SDKs\UWPNuGetPackages\netstandard.library\2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('C:\Program Files (x86)\Microsoft SDKs\UWPNuGetPackages\netstandard.library\2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.net.native.compiler\2.2.1\build\Microsoft.Net.Native.Compiler.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.net.native.compiler\2.2.1\build\Microsoft.Net.Native.Compiler.targets')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.netcore.universalwindowsplatform\6.2.2\build\Microsoft.NetCore.UniversalWindowsPlatform.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.netcore.universalwindowsplatform\6.2.2\build\Microsoft.NetCore.UniversalWindowsPlatform.targets')" />
-    <Import Project="$(NuGetPackageRoot)uno.sourcegenerationtasks\1.31.0-dev.285\build\netstandard1.0\Uno.SourceGenerationTasks.targets" Condition="Exists('$(NuGetPackageRoot)uno.sourcegenerationtasks\1.31.0-dev.285\build\netstandard1.0\Uno.SourceGenerationTasks.targets')" />
-    <Import Project="$(NuGetPackageRoot)uno.core.build\1.28.0-dev.86\build\Uno.Core.Build.targets" Condition="Exists('$(NuGetPackageRoot)uno.core.build\1.28.0-dev.86\build\Uno.Core.Build.targets')" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/obj/x86/Debug/Styles/Application/Colors.g.i.cs b/src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/obj/x86/Debug/Styles/Application/Colors.g.i.cs
deleted file mode 100644
index 30259b2..0000000
--- a/src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/obj/x86/Debug/Styles/Application/Colors.g.i.cs
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/obj/x86/Debug/Styles/Application/Converters.g.i.cs b/src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/obj/x86/Debug/Styles/Application/Converters.g.i.cs
deleted file mode 100644
index 30259b2..0000000
--- a/src/Uno.AzureDevOps/Uno.AzureDevOps.UWP/obj/x86/Debug/Styles/Application/Converters.g.i.cs
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/src/Uno.AzureDevOps/Uno.AzureDevOps.Wasm/obj/Uno.AzureDevOps.Wasm.csproj.nuget.g.targets b/src/Uno.AzureDevOps/Uno.AzureDevOps.Wasm/obj/Uno.AzureDevOps.Wasm.csproj.nuget.g.targets
deleted file mode 100644
index 2727152..0000000
--- a/src/Uno.AzureDevOps/Uno.AzureDevOps.Wasm/obj/Uno.AzureDevOps.Wasm.csproj.nuget.g.targets
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)uno.wasm.bootstrap\1.0.0-dev.265\build\Uno.Wasm.Bootstrap.targets" Condition="Exists('$(NuGetPackageRoot)uno.wasm.bootstrap\1.0.0-dev.265\build\Uno.Wasm.Bootstrap.targets')" />
-    <Import Project="$(NuGetPackageRoot)uno.sourcegenerationtasks\1.31.0-dev.285\build\netstandard1.0\Uno.SourceGenerationTasks.targets" Condition="Exists('$(NuGetPackageRoot)uno.sourcegenerationtasks\1.31.0-dev.285\build\netstandard1.0\Uno.SourceGenerationTasks.targets')" />
-    <Import Project="$(NuGetPackageRoot)uno.core.build\1.28.0-dev.86\build\Uno.Core.Build.targets" Condition="Exists('$(NuGetPackageRoot)uno.core.build\1.28.0-dev.86\build\Uno.Core.Build.targets')" />
-    <Import Project="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\netstandard.library\2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('C:\Program Files\dotnet\sdk\NuGetFallbackFolder\netstandard.library\2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
-    <Import Project="$(NuGetPackageRoot)uno.ui\1.45.0-dev.1813\build\netstandard2.0\uno.ui.targets" Condition="Exists('$(NuGetPackageRoot)uno.ui\1.45.0-dev.1813\build\netstandard2.0\uno.ui.targets')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.typescript.msbuild\3.6.3\build\Microsoft.TypeScript.MSBuild.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.typescript.msbuild\3.6.3\build\Microsoft.TypeScript.MSBuild.targets')" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Uno.AzureDevOps/Uno.AzureDevOps.iOS/obj/Uno.AzureDevOps.iOS.csproj.nuget.g.targets b/src/Uno.AzureDevOps/Uno.AzureDevOps.iOS/obj/Uno.AzureDevOps.iOS.csproj.nuget.g.targets
deleted file mode 100644
index 6050f6d..0000000
--- a/src/Uno.AzureDevOps/Uno.AzureDevOps.iOS/obj/Uno.AzureDevOps.iOS.csproj.nuget.g.targets
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)uno.sourcegenerationtasks\1.31.0-dev.285\build\netstandard1.0\Uno.SourceGenerationTasks.targets" Condition="Exists('$(NuGetPackageRoot)uno.sourcegenerationtasks\1.31.0-dev.285\build\netstandard1.0\Uno.SourceGenerationTasks.targets')" />
-    <Import Project="$(NuGetPackageRoot)uno.core.build\1.28.0-dev.86\build\Uno.Core.Build.targets" Condition="Exists('$(NuGetPackageRoot)uno.core.build\1.28.0-dev.86\build\Uno.Core.Build.targets')" />
-    <Import Project="$(NuGetPackageRoot)uno.ui\1.45.0-dev.1813\build\xamarinios10\uno.ui.targets" Condition="Exists('$(NuGetPackageRoot)uno.ui\1.45.0-dev.1813\build\xamarinios10\uno.ui.targets')" />
-  </ImportGroup>
-</Project>
\ No newline at end of file