From 1468439520c297711d80e1ffef10d66c68a656fe Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 24 Oct 2023 23:23:40 +0200 Subject: [PATCH 01/68] TFM net8.0 --- Directory.Build.props | 11 ++++------- global.json | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 4c0ae4a3..ec5e01aa 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ git - <_DefaultTargetFrameworks>MonoAndroid12.0;net6.0-android + <_DefaultTargetFrameworks>net8.0-android true @@ -25,14 +25,11 @@ - <_TargetFrameworkNugetBuildFolders Include="build\monoandroid12.0" /> - <_TargetFrameworkNugetBuildFolders Include="build\net6.0-android31.0" /> - <_TargetFrameworkNugetBuildFolders Include="buildTransitive\monoandroid12.0" /> - <_TargetFrameworkNugetBuildFolders Include="buildTransitive\net6.0-android31.0" /> + <_TargetFrameworkNugetBuildFolders Include="build\net8.0-android34.0" /> + <_TargetFrameworkNugetBuildFolders Include="buildTransitive\net8.0-android34.0" /> - <_TargetFrameworkNugetAarFolders Include="aar\monoandroid12.0" /> - <_TargetFrameworkNugetAarFolders Include="aar\net6.0-android31.0" /> + <_TargetFrameworkNugetAarFolders Include="aar\net8.0-android34.0" /> diff --git a/global.json b/global.json index 32328144..43bd41e9 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "7.0.306", + "version": "8.0.100-rc.2.23502.2", "rollForward": "patch" }, "msbuild-sdks": From cb7ad78aa1174901074339c4b478992d1a398cc8 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 25 Oct 2023 15:28:39 +0200 Subject: [PATCH 02/68] Update Metadata.xml --- .../pose-detection/Transforms/Metadata.xml | 45 +++++++++++++++++-- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/source/com.google.mlkit/pose-detection/Transforms/Metadata.xml b/source/com.google.mlkit/pose-detection/Transforms/Metadata.xml index f99fe925..306e8762 100644 --- a/source/com.google.mlkit/pose-detection/Transforms/Metadata.xml +++ b/source/com.google.mlkit/pose-detection/Transforms/Metadata.xml @@ -1,14 +1,51 @@  + + + + + SetDetectorModeAsObject + + + SetDetectorModeAsBuilder + - + /> + path="/api/package[@name='com.google.mlkit.vision.pose.defaults']/class[@name='PoseDetectorOptions.Builder']/method[@name='setDetectorMode' and count(parameter)=1 and parameter[1][@type='int']]" + /> + + + + \ No newline at end of file From 427d12ebd364fe6bfef92517a7217068838f2b72 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 26 Oct 2023 22:42:26 +0200 Subject: [PATCH 03/68] object-detection fixes --- .../object-detection/Transforms/Metadata.xml | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/source/com.google.mlkit/object-detection/Transforms/Metadata.xml b/source/com.google.mlkit/object-detection/Transforms/Metadata.xml index 818c1647..311293f2 100644 --- a/source/com.google.mlkit/object-detection/Transforms/Metadata.xml +++ b/source/com.google.mlkit/object-detection/Transforms/Metadata.xml @@ -35,4 +35,43 @@ SetExecutorAlternative + + + + + + + + + + false + + + true + + From cc5b6e3f3062a75b4f34d3cdfa89734da72f8352 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 1 Nov 2023 07:54:01 +0100 Subject: [PATCH 04/68] more metadata fixes --- .../object-detection/Transforms/Metadata.Namespaces.xml | 2 ++ .../com.google.mlkit/object-detection/Transforms/Metadata.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source/com.google.mlkit/object-detection/Transforms/Metadata.Namespaces.xml b/source/com.google.mlkit/object-detection/Transforms/Metadata.Namespaces.xml index 38fcf4cb..b3949166 100755 --- a/source/com.google.mlkit/object-detection/Transforms/Metadata.Namespaces.xml +++ b/source/com.google.mlkit/object-detection/Transforms/Metadata.Namespaces.xml @@ -20,7 +20,9 @@ Xamarin.Google.MLKit.Vision.Objects.Defaults.Internal + diff --git a/source/com.google.mlkit/object-detection/Transforms/Metadata.xml b/source/com.google.mlkit/object-detection/Transforms/Metadata.xml index 311293f2..353c6d93 100644 --- a/source/com.google.mlkit/object-detection/Transforms/Metadata.xml +++ b/source/com.google.mlkit/object-detection/Transforms/Metadata.xml @@ -38,7 +38,7 @@ - - \ No newline at end of file + diff --git a/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/MainActivity.cs b/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/MainActivity.cs index c55bb4bd..9ea353fb 100644 --- a/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/MainActivity.cs +++ b/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/MainActivity.cs @@ -9,6 +9,8 @@ using Google.Android.Material.FloatingActionButton; using Google.Android.Material.Snackbar; using Java.Interop; +using Microsoft.Maui.ApplicationModel; + [assembly: UsesPermission (Android.Manifest.Permission.Internet)] [assembly: UsesPermission (Android.Manifest.Permission.AccessNetworkState)] @@ -24,10 +26,10 @@ public class MainActivity : Activity // AdActivity (final in AndroidX) protected override void OnCreate(Bundle savedInstanceState) { base.OnCreate(savedInstanceState); - Xamarin.Essentials.Platform.Init(this, savedInstanceState); + Platform.Init(this, savedInstanceState); SetContentView(Resource.Layout.activity_main); - Toolbar toolbar = FindViewById(Resource.Id.toolbar); + AndroidX.AppCompat.Widget.Toolbar toolbar = FindViewById(Resource.Id.toolbar); //SetSupportActionBar(toolbar); FloatingActionButton fab = FindViewById(Resource.Id.fab); @@ -68,7 +70,7 @@ private void FabOnClick(object sender, EventArgs eventArgs) } public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults) { - Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults); + Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults); base.OnRequestPermissionsResult(requestCode, permissions, grantResults); } diff --git a/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/Properties/AndroidManifest.xml b/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/Properties/AndroidManifest.xml index 02271454..75ab68fe 100644 --- a/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/Properties/AndroidManifest.xml +++ b/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/Properties/AssemblyInfo.cs b/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/Properties/AssemblyInfo.cs deleted file mode 100644 index a62345f6..00000000 --- a/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Android.App; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("AdsLiteSample")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("AdsLiteSample")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] From c4b5b75c6859b3e37a4c90fd5788f83a9dbdfaf7 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 15 Apr 2024 22:19:52 +0200 Subject: [PATCH 11/68] ads sample ported --- .../AdMobSample.UITests.csproj | 28 ++++++++++- .../AdMobSample/AdMobSample.csproj | 47 ++++++++++++++----- .../AdMobSample/InterstitialActivity.cs | 2 +- .../Properties/AndroidManifest.xml | 2 +- .../AdMobSample/Properties/AssemblyInfo.cs | 27 ----------- 5 files changed, 63 insertions(+), 43 deletions(-) delete mode 100644 samples/com.google.android.gms/play-services-ads/AdMobSample/Properties/AssemblyInfo.cs diff --git a/samples/com.google.android.gms/play-services-ads/AdMobSample.UITests/AdMobSample.UITests.csproj b/samples/com.google.android.gms/play-services-ads/AdMobSample.UITests/AdMobSample.UITests.csproj index 0194b74a..9e506847 100644 --- a/samples/com.google.android.gms/play-services-ads/AdMobSample.UITests/AdMobSample.UITests.csproj +++ b/samples/com.google.android.gms/play-services-ads/AdMobSample.UITests/AdMobSample.UITests.csproj @@ -1,3 +1,28 @@ + + + + net8.0-android + false + true + + + + + + + + + + + + + + + + + + + diff --git a/samples/com.google.android.gms/play-services-ads/AdMobSample/AdMobSample.csproj b/samples/com.google.android.gms/play-services-ads/AdMobSample/AdMobSample.csproj index 9b199f56..0f9508f3 100644 --- a/samples/com.google.android.gms/play-services-ads/AdMobSample/AdMobSample.csproj +++ b/samples/com.google.android.gms/play-services-ads/AdMobSample/AdMobSample.csproj @@ -1,4 +1,35 @@ - + + + net8.0-android + 21 + Exe + enable + enable + AdMobSample + AdMob + 1 + 1.0 + + + + + + + + + 0.11.4 + + + 122.3.0.3 + + + 117.6.0 + + + + + diff --git a/samples/com.google.android.gms/play-services-ads/AdMobSample/InterstitialActivity.cs b/samples/com.google.android.gms/play-services-ads/AdMobSample/InterstitialActivity.cs index cd1a3842..b28f00ed 100644 --- a/samples/com.google.android.gms/play-services-ads/AdMobSample/InterstitialActivity.cs +++ b/samples/com.google.android.gms/play-services-ads/AdMobSample/InterstitialActivity.cs @@ -41,7 +41,7 @@ protected override void OnCreate (Bundle savedInstanceState) Resources.GetString(Resource.String.ad_unit_id), //interstitial, new AdRequest.Builder().Build(), - new InterstitialAdLoadCallback(showButton) + null // new InterstitialAdLoadCallback(showButton) ); showButton = FindViewById