From 25887e55148391028b34b4fd6073120e9e7fdea6 Mon Sep 17 00:00:00 2001
From: Miljenko Cvjetko moljac <mcvjetko@holisticware.net>
Date: Mon, 9 Mar 2020 09:46:54 +0100
Subject: [PATCH] target framework bump to avoid MSBuild.Extras issue
 https://github.com/novotnyllc/MSBuildSdkExtras/issues/190
 https://github.com/videolan/libvlcsharp/pull/71#issuecomment-540333184

---
 Android/SceneForm/source/Assets/Assets.csproj |  2 +-
 Android/SceneForm/source/Base/Base.csproj     |  2 +-
 Android/SceneForm/source/Core/Core.csproj     |  2 +-
 .../SceneForm/source/Filament/Filament.csproj |  2 +-
 .../source/Rendering/Rendering.csproj         |  2 +-
 .../source/UX.AndroidX/UX.AndroidX.csproj     |  4 +-
 .../SceneForm/source/UX/RotationController.cs | 55 ------------------
 .../SceneForm/source/UX/ScaleController.cs    | 56 -------------------
 .../source/UX/TranslationController.cs        | 54 ------------------
 Android/SceneForm/source/UX/UX.csproj         |  2 +-
 10 files changed, 8 insertions(+), 173 deletions(-)
 delete mode 100644 Android/SceneForm/source/UX/RotationController.cs
 delete mode 100644 Android/SceneForm/source/UX/ScaleController.cs
 delete mode 100644 Android/SceneForm/source/UX/TranslationController.cs

diff --git a/Android/SceneForm/source/Assets/Assets.csproj b/Android/SceneForm/source/Assets/Assets.csproj
index 69080d9d1d..9df4b53879 100644
--- a/Android/SceneForm/source/Assets/Assets.csproj
+++ b/Android/SceneForm/source/Assets/Assets.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
-    <TargetFramework>MonoAndroid81</TargetFramework>
+    <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
     <AssemblyName>Xamarin.Android.SceneForm.Assets</AssemblyName>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
diff --git a/Android/SceneForm/source/Base/Base.csproj b/Android/SceneForm/source/Base/Base.csproj
index a19240aa42..0fb0ecdba6 100644
--- a/Android/SceneForm/source/Base/Base.csproj
+++ b/Android/SceneForm/source/Base/Base.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
-    <TargetFramework>MonoAndroid81</TargetFramework>
+    <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
     <AssemblyName>Xamarin.Android.SceneForm.Base</AssemblyName>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
diff --git a/Android/SceneForm/source/Core/Core.csproj b/Android/SceneForm/source/Core/Core.csproj
index 12064e3c12..076d830b85 100644
--- a/Android/SceneForm/source/Core/Core.csproj
+++ b/Android/SceneForm/source/Core/Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
-    <TargetFramework>MonoAndroid81</TargetFramework>
+    <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
     <AssemblyName>Xamarin.Android.SceneForm.Core</AssemblyName>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
diff --git a/Android/SceneForm/source/Filament/Filament.csproj b/Android/SceneForm/source/Filament/Filament.csproj
index 0c687a785e..d6ab9a1ae2 100644
--- a/Android/SceneForm/source/Filament/Filament.csproj
+++ b/Android/SceneForm/source/Filament/Filament.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
-    <TargetFramework>MonoAndroid81</TargetFramework>
+    <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
     <AssemblyName>Xamarin.Android.SceneForm.Filament</AssemblyName>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
diff --git a/Android/SceneForm/source/Rendering/Rendering.csproj b/Android/SceneForm/source/Rendering/Rendering.csproj
index c8ff9e77d4..0a4a619292 100644
--- a/Android/SceneForm/source/Rendering/Rendering.csproj
+++ b/Android/SceneForm/source/Rendering/Rendering.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
-    <TargetFramework>MonoAndroid81</TargetFramework>
+    <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
     <AssemblyName>Xamarin.Android.SceneForm.Rendering</AssemblyName>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
diff --git a/Android/SceneForm/source/UX.AndroidX/UX.AndroidX.csproj b/Android/SceneForm/source/UX.AndroidX/UX.AndroidX.csproj
index f86280c300..575cf7e6fe 100644
--- a/Android/SceneForm/source/UX.AndroidX/UX.AndroidX.csproj
+++ b/Android/SceneForm/source/UX.AndroidX/UX.AndroidX.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
-    <TargetFramework>MonoAndroid81</TargetFramework>
+    <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
     <AssemblyName>Xamarin.Android.SceneForm.UX.AndroidX</AssemblyName>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
@@ -47,7 +47,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Android.Support.Fragment" Version="28.0.0.3" />
+    <PackageReference Include="Xamarin.AndroidX.Fragment" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Android/SceneForm/source/UX/RotationController.cs b/Android/SceneForm/source/UX/RotationController.cs
deleted file mode 100644
index d16e95a750..0000000000
--- a/Android/SceneForm/source/UX/RotationController.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Java.Interop;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Google.AR.Sceneform.UX
-{
-    public partial class RotationController
-    {
-        protected override unsafe void OnEndTransformation(global::Java.Lang.Object gesture)
-        {
-            const string __id = "onEndTransformation.(Ljava/lang/Object;)V";
-            try
-            {
-                JniArgumentValue* __args = stackalloc JniArgumentValue[1];
-                __args[0] = new JniArgumentValue((gesture == null) ? IntPtr.Zero : ((global::Java.Lang.Object)gesture).Handle);
-                _members.InstanceMethods.InvokeVirtualVoidMethod(__id, this, __args);
-            }
-            finally
-            {
-            }
-        }
-
-        protected override unsafe void OnContinueTransformation(global::Java.Lang.Object gesture)
-        {
-            const string __id = "onContinueTransformation.(Ljava/lang/Object;)V";
-            try
-            {
-                JniArgumentValue* __args = stackalloc JniArgumentValue[1];
-                __args[0] = new JniArgumentValue((gesture == null) ? IntPtr.Zero : ((global::Java.Lang.Object)gesture).Handle);
-                _members.InstanceMethods.InvokeVirtualVoidMethod(__id, this, __args);
-            }
-            finally
-            {
-            }
-        }
-
-        protected override unsafe bool CanStartTransformation(global::Java.Lang.Object gesture)
-        {
-            const string __id = "canStartTransformation.(Ljava/lang/Object;)Z";
-            try
-            {
-                JniArgumentValue* __args = stackalloc JniArgumentValue[1];
-                __args[0] = new JniArgumentValue((gesture == null) ? IntPtr.Zero : ((global::Java.Lang.Object)gesture).Handle);
-                var __rm = _members.InstanceMethods.InvokeVirtualBooleanMethod(__id, this, __args);
-                return __rm;
-            }
-            finally
-            {
-            }
-        }
-    }
-}
diff --git a/Android/SceneForm/source/UX/ScaleController.cs b/Android/SceneForm/source/UX/ScaleController.cs
deleted file mode 100644
index 7e4479aff7..0000000000
--- a/Android/SceneForm/source/UX/ScaleController.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using Java.Interop;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Google.AR.Sceneform.UX
-{
-
-    public partial class ScaleController
-    {
-        protected override unsafe void OnEndTransformation(global::Java.Lang.Object gesture)
-        {
-            const string __id = "onEndTransformation.(Ljava/lang/Object;)V";
-            try
-            {
-                JniArgumentValue* __args = stackalloc JniArgumentValue[1];
-                __args[0] = new JniArgumentValue((gesture == null) ? IntPtr.Zero : ((global::Java.Lang.Object)gesture).Handle);
-                _members.InstanceMethods.InvokeVirtualVoidMethod(__id, this, __args);
-            }
-            finally
-            {
-            }
-        }
-
-        protected override unsafe void OnContinueTransformation(global::Java.Lang.Object gesture)
-        {
-            const string __id = "onContinueTransformation.(Ljava/lang/Object;)V";
-            try
-            {
-                JniArgumentValue* __args = stackalloc JniArgumentValue[1];
-                __args[0] = new JniArgumentValue((gesture == null) ? IntPtr.Zero : ((global::Java.Lang.Object)gesture).Handle);
-                _members.InstanceMethods.InvokeVirtualVoidMethod(__id, this, __args);
-            }
-            finally
-            {
-            }
-        }
-
-        protected override unsafe bool CanStartTransformation(global::Java.Lang.Object gesture)
-        {
-            const string __id = "canStartTransformation.(Ljava/lang/Object;)Z";
-            try
-            {
-                JniArgumentValue* __args = stackalloc JniArgumentValue[1];
-                __args[0] = new JniArgumentValue((gesture == null) ? IntPtr.Zero : ((global::Java.Lang.Object)gesture).Handle);
-                var __rm = _members.InstanceMethods.InvokeVirtualBooleanMethod(__id, this, __args);
-                return __rm;
-            }
-            finally
-            {
-            }
-        }
-    }
-}
diff --git a/Android/SceneForm/source/UX/TranslationController.cs b/Android/SceneForm/source/UX/TranslationController.cs
deleted file mode 100644
index dcd476b39d..0000000000
--- a/Android/SceneForm/source/UX/TranslationController.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using Java.Interop;
-
-namespace Google.AR.Sceneform.UX
-{
-
-    public partial class TranslationController
-    {
-        
-        protected override unsafe void OnEndTransformation(global::Java.Lang.Object gesture)
-        {
-            const string __id = "onEndTransformation.(Ljava/lang/Object;)V";
-            try
-            {
-                JniArgumentValue* __args = stackalloc JniArgumentValue[1];
-                __args[0] = new JniArgumentValue((gesture == null) ? IntPtr.Zero : ((global::Java.Lang.Object)gesture).Handle);
-               _members.InstanceMethods.InvokeVirtualVoidMethod(__id, this, __args);
-            }
-            finally
-            {
-            }
-        }
-
-        protected override unsafe void OnContinueTransformation(global::Java.Lang.Object gesture)
-        {
-            const string __id = "onContinueTransformation.(Ljava/lang/Object;)V";
-            try
-            {
-                JniArgumentValue* __args = stackalloc JniArgumentValue[1];
-                __args[0] = new JniArgumentValue((gesture == null) ? IntPtr.Zero : ((global::Java.Lang.Object)gesture).Handle);
-                _members.InstanceMethods.InvokeVirtualVoidMethod(__id, this, __args);
-            }
-            finally
-            {
-            }
-        }
-
-        protected override unsafe bool CanStartTransformation(global::Java.Lang.Object gesture)
-        {
-            const string __id = "canStartTransformation.(Ljava/lang/Object;)Z";
-            try
-            {
-                JniArgumentValue* __args = stackalloc JniArgumentValue[1];
-                __args[0] = new JniArgumentValue((gesture == null) ? IntPtr.Zero : ((global::Java.Lang.Object)gesture).Handle);
-                var __rm = _members.InstanceMethods.InvokeVirtualBooleanMethod(__id, this, __args);
-                return __rm;
-            }
-            finally
-            {
-            }
-        }
-
-    }
-}
diff --git a/Android/SceneForm/source/UX/UX.csproj b/Android/SceneForm/source/UX/UX.csproj
index 308c0ea5f3..bcc3f0ffd6 100644
--- a/Android/SceneForm/source/UX/UX.csproj
+++ b/Android/SceneForm/source/UX/UX.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
-    <TargetFramework>MonoAndroid81</TargetFramework>
+    <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
     <AssemblyName>Xamarin.Android.SceneForm.UX</AssemblyName>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>