From 4bc7e79141ceb9aea7a981cbbb2793d148ac1826 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 14 Apr 2025 17:01:08 +0200 Subject: [PATCH 01/27] Update global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 86b25b508..0d8cf64bd 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "8.0.407", + "version": "8.0.408", "rollForward": "patch" }, "msbuild-sdks": From 7a50e53898d423e7de39e96e200353652e589f25 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 14 Apr 2025 18:53:51 +0200 Subject: [PATCH 02/27] Update variables.yml --- build/ci/variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/variables.yml b/build/ci/variables.yml index 7a3bcd8e2..419497901 100644 --- a/build/ci/variables.yml +++ b/build/ci/variables.yml @@ -19,7 +19,7 @@ variables: macosAgentPoolName: VSEng-VSMac-Xamarin-Shared # macOS VM pool name # Tool variables - dotnetVersion: '8.0.407' # .NET version to install on agent + dotnetVersion: '8.0.408' # .NET version to install on agent dotnetWorkloadRollbackFile: 'workloads.json' # Rollback file specifying workload versions to install dotnetNuGetOrgSource: 'https://api.nuget.org/v3/index.json' # NuGet.org URL to find workloads dotnetWorkloadSource: 'https://aka.ms/dotnet6/nuget/index.json' # .NET engineering URL to find workloads From 14c51516768f7493747d63bde67777b5f6c5fc30 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 14 Apr 2025 19:04:05 +0200 Subject: [PATCH 03/27] Update Xamarin.AndroidBinderator.csproj --- .../Xamarin.AndroidBinderator.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj b/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj index b68ef2fe3..3cba182f6 100644 --- a/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj +++ b/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj @@ -1,7 +1,7 @@ - net8.0 + net8.0 12.0 true AndroidBinderator @@ -25,7 +25,7 @@ - + From da5e599876be07ea0dc83fd7f9d557fd2ef79642 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 14 Apr 2025 19:07:17 +0200 Subject: [PATCH 04/27] Update Xamarin.Build.Download.Tests.csproj --- .../Xamarin.Build.Download.Tests.csproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj b/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj index 9ef6db7f5..a6cf5668b 100644 --- a/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj +++ b/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 true Major @@ -12,14 +12,14 @@ - + - - + + all runtime; build; native; contentfiles; analyzers - + From 15787813c0fcf8b82334ff88b11d680eee9c86bb Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 14 Apr 2025 19:08:06 +0200 Subject: [PATCH 05/27] Update Xamarin.Build.Download.csproj --- .../source/Xamarin.Build.Download/Xamarin.Build.Download.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj b/util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj index c6e701fe4..5b959c40c 100644 --- a/util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj +++ b/util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj @@ -42,6 +42,6 @@ - + From e9918001fe929e54453d8f23cb52568491b1f011 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 14 Apr 2025 22:14:58 +0200 Subject: [PATCH 06/27] Update workloads.json --- workloads.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/workloads.json b/workloads.json index 97f51af2d..3aadb359c 100644 --- a/workloads.json +++ b/workloads.json @@ -1,10 +1,10 @@ { - "microsoft.net.sdk.android": "34.0.143/8.0.100", - "microsoft.net.sdk.ios": "18.0.8303/8.0.100", - "microsoft.net.sdk.maccatalyst": "18.0.8303/8.0.100", - "microsoft.net.sdk.macos": "15.0.8303/8.0.100", - "microsoft.net.sdk.maui": "8.0.82/8.0.100", - "microsoft.net.sdk.tvos": "18.0.8303/8.0.100", - "microsoft.net.workload.mono.toolchain.current": "8.0.10/8.0.100", - "microsoft.net.workload.emscripten.current": "8.0.10/8.0.100" + "microsoft.net.sdk.android": "34.0.154/8.0.100", + "microsoft.net.sdk.ios": "18.0.8319/8.0.100", + "microsoft.net.sdk.maccatalyst": "18.0.8319/8.0.100", + "microsoft.net.sdk.macos": "15.0.8319/8.0.100", + "microsoft.net.sdk.maui": "8.0.100/8.0.100", + "microsoft.net.sdk.tvos": "18.0.8319/8.0.100", + "microsoft.net.workload.mono.toolchain.current": "8.0.15/8.0.100", + "microsoft.net.workload.emscripten.current": "8.0.15/8.0.100" } From 56fce2d80aa6ffe8767cd84aef392d27e5c718ed Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 14 Apr 2025 22:19:08 +0200 Subject: [PATCH 07/27] package updates --- tests/allpackages/AllPackagesTests.csproj | 8 ++++---- tests/extended/ExtendedTests.csproj | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/allpackages/AllPackagesTests.csproj b/tests/allpackages/AllPackagesTests.csproj index d6f29bbff..ace91ec6f 100644 --- a/tests/allpackages/AllPackagesTests.csproj +++ b/tests/allpackages/AllPackagesTests.csproj @@ -10,11 +10,11 @@ - - + + - - + + diff --git a/tests/extended/ExtendedTests.csproj b/tests/extended/ExtendedTests.csproj index d6f29bbff..ace91ec6f 100644 --- a/tests/extended/ExtendedTests.csproj +++ b/tests/extended/ExtendedTests.csproj @@ -10,11 +10,11 @@ - - + + - - + + From 0e89fe1b80092dd0eb236d941fd5cb446658f165 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 15 Apr 2025 21:59:03 +0200 Subject: [PATCH 08/27] TFM fix --- tests/allpackages/TestAllIndividualPackages.cs | 11 +++++++++++ tests/extended/TestAllIndividualPackages.cs | 14 +++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/tests/allpackages/TestAllIndividualPackages.cs b/tests/allpackages/TestAllIndividualPackages.cs index 2a87e8467..c0ba75fd7 100644 --- a/tests/allpackages/TestAllIndividualPackages.cs +++ b/tests/allpackages/TestAllIndividualPackages.cs @@ -170,6 +170,17 @@ async Task TestAllPackages (string template, bool isGps) return; } + XmlDocument xd = new (); + xd.Load (proj_file); + + XmlNodeList nl = xd.SelectNodes("//*[starts-with(name(), 'TargetFramework')]"); + + foreach (XmlNode node in nl) + { + node.InnerText = $"{net_version}-android"; + } + xd.Save(proj_file); + ReplaceInFile (proj_file, ">21", $">{platform_version}"); ReplaceInFile (proj_file, ">21.0", $">{platform_version}"); ReplaceInFile (proj_file, $";{net_version}-ios", ""); diff --git a/tests/extended/TestAllIndividualPackages.cs b/tests/extended/TestAllIndividualPackages.cs index 530d59f3b..8aacdaf17 100644 --- a/tests/extended/TestAllIndividualPackages.cs +++ b/tests/extended/TestAllIndividualPackages.cs @@ -91,8 +91,20 @@ async Task TestPackage (string id, string version, string template) // - Replace with the maximum version some packages require // - Remove the target frameworks that are not 'android' var proj_file = Directory.GetFiles (case_dir, "*.csproj").FirstOrDefault (); - + if (proj_file is not null) { + + XmlDocument xd = new (); + xd.Load (proj_file); + + XmlNodeList nl = xd.SelectNodes("//*[starts-with(name(), 'TargetFramework')]"); + + foreach (XmlNode node in nl) + { + node.InnerText = $"{net_version}-android"; + } + xd.Save(proj_file); + ReplaceInFile (proj_file, ">21", $">{platform_version}"); ReplaceInFile (proj_file, ">21.0", $">{platform_version}"); ReplaceInFile (proj_file, $";{net_version}-ios", ""); From 049cf4c079699290ef86ddccf7ebdc32c4fa6f9f Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 18 Apr 2025 21:43:41 +0200 Subject: [PATCH 09/27] nullable fixes --- tests/extended/TestAllIndividualPackages.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/extended/TestAllIndividualPackages.cs b/tests/extended/TestAllIndividualPackages.cs index 58133a14d..d205be688 100644 --- a/tests/extended/TestAllIndividualPackages.cs +++ b/tests/extended/TestAllIndividualPackages.cs @@ -1,4 +1,5 @@ using System.Text; +using System.Xml; using CliWrap; using CliWrap.Buffered; using NUnit.Framework; @@ -97,13 +98,15 @@ async Task TestPackage (string id, string version, string template) XmlDocument xd = new (); xd.Load (proj_file); - XmlNodeList nl = xd.SelectNodes("//*[starts-with(name(), 'TargetFramework')]"); + XmlNodeList? nl = xd.SelectNodes("//*[starts-with(name(), 'TargetFramework')]"); - foreach (XmlNode node in nl) - { - node.InnerText = $"{net_version}-android"; + if (nl is not null) { + foreach (XmlNode node in nl) { + node.InnerText = $"{net_version}-android"; + } + + xd.Save (proj_file); } - xd.Save(proj_file); ReplaceInFile (proj_file, ">21", $">{platform_version}"); ReplaceInFile (proj_file, ">21.0", $">{platform_version}"); From 2d98a1b7237defb120d93c219f6fc59b433af776 Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 20 Apr 2025 11:23:06 +0200 Subject: [PATCH 10/27] Update build.cake --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index 57acd7017..4a2c62841 100755 --- a/build.cake +++ b/build.cake @@ -1,5 +1,5 @@ // Used by binderator, "Windows" is fine because we only use managed code from it -#tool nuget:?package=Microsoft.Android.Sdk.Windows&version=35.0.0-rc.1.80 +#tool nuget:?package=Microsoft.Android.Sdk.Windows&version=35.0.61 // Cake Addins #addin nuget:?package=Cake.FileHelpers&version=7.0.0 From 0eb105d33df0e564e1eb635d1917735f3ad22dac Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 20 Apr 2025 11:23:11 +0200 Subject: [PATCH 11/27] Update Xamarin.AndroidBinderator.csproj --- .../Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj b/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj index 3cba182f6..5b5403949 100644 --- a/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj +++ b/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj @@ -35,7 +35,7 @@ - ..\..\..\tools\Microsoft.Android.Sdk.Windows.35.0.0-rc.1.80\tools\Java.Interop.Tools.Maven.dll + ..\..\..\tools\Microsoft.Android.Sdk.Windows.35.0.61\tools\Java.Interop.Tools.Maven.dll True From 9cfd319b18a6632657439e998f46b42ffaabaee5 Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 20 Apr 2025 11:24:10 +0200 Subject: [PATCH 12/27] automatic files --- cgmanifest.json | 28 +----------------- docs/artifact-list-with-versions.md | 44 ++++++++++++++--------------- docs/artifact-list.md | 42 +++++++++++++-------------- 3 files changed, 42 insertions(+), 72 deletions(-) diff --git a/cgmanifest.json b/cgmanifest.json index 3d5dabc7f..409274284 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -4729,7 +4729,7 @@ "groupId": "com.google.android.gms", "version": "16.0.0-alpha04", "nuGetId": "Xamarin.GooglePlayServices.Identity.Credentials", - "nuGetVersion": "116.0.0" + "nuGetVersion": "116.0.0-alpha04" } }, "license": "Android Software Development Kit License" @@ -8284,32 +8284,6 @@ }, "license": "The Apache Software License, Version 2.0" }, - { - "component": { - "type": "maven", - "maven": { - "artifactId": "kotlinx-serialization-protobuf", - "groupId": "org.jetbrains.kotlinx", - "version": "1.7.3", - "nuGetId": "Xamarin.KotlinX.Serialization.Protobuf", - "nuGetVersion": "1.7.3.3" - } - }, - "license": "The Apache Software License, Version 2.0" - }, - { - "component": { - "type": "maven", - "maven": { - "artifactId": "kotlinx-serialization-protobuf-jvm", - "groupId": "org.jetbrains.kotlinx", - "version": "1.7.3", - "nuGetId": "Xamarin.KotlinX.Serialization.Protobuf.Jvm", - "nuGetVersion": "1.7.3.3" - } - }, - "license": "The Apache Software License, Version 2.0" - }, { "component": { "type": "maven", diff --git a/docs/artifact-list-with-versions.md b/docs/artifact-list-with-versions.md index 1032e9376..8db23c26b 100644 --- a/docs/artifact-list-with-versions.md +++ b/docs/artifact-list-with-versions.md @@ -369,7 +369,7 @@ | 362|com.google.android.gms:play-services-gcm |17.0.0 |Xamarin.GooglePlayServices.Gcm |117.0.0.20 | | 363|com.google.android.gms:play-services-home |16.0.0 |Xamarin.GooglePlayServices.Home |116.0.0.13 | | 364|com.google.android.gms:play-services-identity |18.1.0 |Xamarin.GooglePlayServices.Identity |118.1.0.4 | -| 365|com.google.android.gms:play-services-identity-credentials |16.0.0-alpha04 |Xamarin.GooglePlayServices.Identity.Credentials |116.0.0 | +| 365|com.google.android.gms:play-services-identity-credentials |16.0.0-alpha04 |Xamarin.GooglePlayServices.Identity.Credentials |116.0.0-alpha04 | | 366|com.google.android.gms:play-services-iid |17.0.0 |Xamarin.GooglePlayServices.Iid |117.0.0.20 | | 367|com.google.android.gms:play-services-instantapps |18.1.0 |Xamarin.GooglePlayServices.InstantApps |118.1.0.4 | | 368|com.google.android.gms:play-services-location |21.3.0 |Xamarin.GooglePlayServices.Location |121.3.0.4 | @@ -644,25 +644,23 @@ | 637|org.jetbrains.kotlinx:kotlinx-serialization-json |1.7.3 |Xamarin.KotlinX.Serialization.Json |1.7.3.3 | | 638|org.jetbrains.kotlinx:kotlinx-serialization-json-jvm |1.7.3 |Xamarin.KotlinX.Serialization.Json.Jvm |1.7.3.3 | | 639|org.jetbrains.kotlinx:kotlinx-serialization-protobuf |1.7.3 |Xamarin.KotlinX.Serialization.Protobuf |1.7.3.3 | -| 640|org.jetbrains.kotlinx:kotlinx-serialization-protobuf |1.7.3 |Xamarin.KotlinX.Serialization.Protobuf |1.7.3.3 | -| 641|org.jetbrains.kotlinx:kotlinx-serialization-protobuf-jvm |1.7.3 |Xamarin.KotlinX.Serialization.Protobuf.Jvm |1.7.3.3 | -| 642|org.jetbrains.kotlinx:kotlinx-serialization-protobuf-jvm |1.7.3 |Xamarin.KotlinX.Serialization.Protobuf.Jvm |1.7.3.3 | -| 643|org.jspecify:jspecify |1.0.0 |Xamarin.JSpecify |1.0.0.1 | -| 644|org.ow2.asm:asm |9.7.1 |Xamarin.OW2.ASM |9.7.1.2 | -| 645|org.reactivestreams:reactive-streams |1.0.4 |Xamarin.Android.ReactiveStreams |1.0.4.18 | -| 646|org.tensorflow:tensorflow-android |1.13.1 |Xamarin.TensorFlow.Android |1.13.1.12 | -| 647|org.tensorflow:tensorflow-lite |2.16.1 |Xamarin.TensorFlow.Lite |2.16.1.4 | -| 648|org.tensorflow:tensorflow-lite-api |2.16.1 |Xamarin.TensorFlow.Lite.Api |2.16.1.4 | -| 649|org.tensorflow:tensorflow-lite-gpu |2.16.1 |Xamarin.TensorFlow.Lite.Gpu |2.16.1.4 | -| 650|org.tensorflow:tensorflow-lite-gpu-api |2.16.1 |Xamarin.TensorFlow.Lite.Gpu.Api |2.16.1.4 | -| 651|org.tensorflow:tensorflow-lite-metadata |0.5.0 |Xamarin.TensorFlow.Lite.Metadata |0.5.0 | -| 652|org.tensorflow:tensorflow-lite-select-tf-ops |2.16.1 |Xamarin.TensorFlow.Lite.Select.TF.Ops |2.16.1.4 | -| 653|org.tensorflow:tensorflow-lite-support |0.5.0 |Xamarin.TensorFlow.Lite.Support.Library |0.5.0 | -| 654|org.tensorflow:tensorflow-lite-support-api |0.5.0 |Xamarin.TensorFlow.Lite.Support.Api |0.5.0 | -| 655|org.tensorflow:tensorflow-lite-task-audio |0.4.4 |Xamarin.TensorFlow.Lite.Task.Audio.Library |0.4.4.9 | -| 656|org.tensorflow:tensorflow-lite-task-audio-play-services |0.4.4 |Xamarin.TensorFlow.Lite.Task.Audio.PlayServices.Library |0.4.4.9 | -| 657|org.tensorflow:tensorflow-lite-task-base |0.4.4 |Xamarin.TensorFlow.Lite.Task.Base.Library |0.4.4.9 | -| 658|org.tensorflow:tensorflow-lite-task-text |0.4.4 |Xamarin.TensorFlow.Lite.Task.Text.Library |0.4.4.9 | -| 659|org.tensorflow:tensorflow-lite-task-text-play-services |0.4.4 |Xamarin.TensorFlow.Lite.Task.Text.PlayServices.Library |0.4.4.9 | -| 660|org.tensorflow:tensorflow-lite-task-vision |0.4.4 |Xamarin.TensorFlow.Lite.Task.Vision.Library |0.4.4.9 | -| 661|org.tensorflow:tensorflow-lite-task-vision-play-services |0.4.4 |Xamarin.TensorFlow.Lite.Task.Vision.PlayServices.Library |0.4.4.9 | +| 640|org.jetbrains.kotlinx:kotlinx-serialization-protobuf-jvm |1.7.3 |Xamarin.KotlinX.Serialization.Protobuf.Jvm |1.7.3.3 | +| 641|org.jspecify:jspecify |1.0.0 |Xamarin.JSpecify |1.0.0.1 | +| 642|org.ow2.asm:asm |9.7.1 |Xamarin.OW2.ASM |9.7.1.2 | +| 643|org.reactivestreams:reactive-streams |1.0.4 |Xamarin.Android.ReactiveStreams |1.0.4.18 | +| 644|org.tensorflow:tensorflow-android |1.13.1 |Xamarin.TensorFlow.Android |1.13.1.12 | +| 645|org.tensorflow:tensorflow-lite |2.16.1 |Xamarin.TensorFlow.Lite |2.16.1.4 | +| 646|org.tensorflow:tensorflow-lite-api |2.16.1 |Xamarin.TensorFlow.Lite.Api |2.16.1.4 | +| 647|org.tensorflow:tensorflow-lite-gpu |2.16.1 |Xamarin.TensorFlow.Lite.Gpu |2.16.1.4 | +| 648|org.tensorflow:tensorflow-lite-gpu-api |2.16.1 |Xamarin.TensorFlow.Lite.Gpu.Api |2.16.1.4 | +| 649|org.tensorflow:tensorflow-lite-metadata |0.5.0 |Xamarin.TensorFlow.Lite.Metadata |0.5.0 | +| 650|org.tensorflow:tensorflow-lite-select-tf-ops |2.16.1 |Xamarin.TensorFlow.Lite.Select.TF.Ops |2.16.1.4 | +| 651|org.tensorflow:tensorflow-lite-support |0.5.0 |Xamarin.TensorFlow.Lite.Support.Library |0.5.0 | +| 652|org.tensorflow:tensorflow-lite-support-api |0.5.0 |Xamarin.TensorFlow.Lite.Support.Api |0.5.0 | +| 653|org.tensorflow:tensorflow-lite-task-audio |0.4.4 |Xamarin.TensorFlow.Lite.Task.Audio.Library |0.4.4.9 | +| 654|org.tensorflow:tensorflow-lite-task-audio-play-services |0.4.4 |Xamarin.TensorFlow.Lite.Task.Audio.PlayServices.Library |0.4.4.9 | +| 655|org.tensorflow:tensorflow-lite-task-base |0.4.4 |Xamarin.TensorFlow.Lite.Task.Base.Library |0.4.4.9 | +| 656|org.tensorflow:tensorflow-lite-task-text |0.4.4 |Xamarin.TensorFlow.Lite.Task.Text.Library |0.4.4.9 | +| 657|org.tensorflow:tensorflow-lite-task-text-play-services |0.4.4 |Xamarin.TensorFlow.Lite.Task.Text.PlayServices.Library |0.4.4.9 | +| 658|org.tensorflow:tensorflow-lite-task-vision |0.4.4 |Xamarin.TensorFlow.Lite.Task.Vision.Library |0.4.4.9 | +| 659|org.tensorflow:tensorflow-lite-task-vision-play-services |0.4.4 |Xamarin.TensorFlow.Lite.Task.Vision.PlayServices.Library |0.4.4.9 | diff --git a/docs/artifact-list.md b/docs/artifact-list.md index a4db8d108..2f85fca1a 100644 --- a/docs/artifact-list.md +++ b/docs/artifact-list.md @@ -644,25 +644,23 @@ | 637|org.jetbrains.kotlinx:kotlinx-serialization-json |Xamarin.KotlinX.Serialization.Json | | 638|org.jetbrains.kotlinx:kotlinx-serialization-json-jvm |Xamarin.KotlinX.Serialization.Json.Jvm | | 639|org.jetbrains.kotlinx:kotlinx-serialization-protobuf |Xamarin.KotlinX.Serialization.Protobuf | -| 640|org.jetbrains.kotlinx:kotlinx-serialization-protobuf |Xamarin.KotlinX.Serialization.Protobuf | -| 641|org.jetbrains.kotlinx:kotlinx-serialization-protobuf-jvm |Xamarin.KotlinX.Serialization.Protobuf.Jvm | -| 642|org.jetbrains.kotlinx:kotlinx-serialization-protobuf-jvm |Xamarin.KotlinX.Serialization.Protobuf.Jvm | -| 643|org.jspecify:jspecify |Xamarin.JSpecify | -| 644|org.ow2.asm:asm |Xamarin.OW2.ASM | -| 645|org.reactivestreams:reactive-streams |Xamarin.Android.ReactiveStreams | -| 646|org.tensorflow:tensorflow-android |Xamarin.TensorFlow.Android | -| 647|org.tensorflow:tensorflow-lite |Xamarin.TensorFlow.Lite | -| 648|org.tensorflow:tensorflow-lite-api |Xamarin.TensorFlow.Lite.Api | -| 649|org.tensorflow:tensorflow-lite-gpu |Xamarin.TensorFlow.Lite.Gpu | -| 650|org.tensorflow:tensorflow-lite-gpu-api |Xamarin.TensorFlow.Lite.Gpu.Api | -| 651|org.tensorflow:tensorflow-lite-metadata |Xamarin.TensorFlow.Lite.Metadata | -| 652|org.tensorflow:tensorflow-lite-select-tf-ops |Xamarin.TensorFlow.Lite.Select.TF.Ops | -| 653|org.tensorflow:tensorflow-lite-support |Xamarin.TensorFlow.Lite.Support.Library | -| 654|org.tensorflow:tensorflow-lite-support-api |Xamarin.TensorFlow.Lite.Support.Api | -| 655|org.tensorflow:tensorflow-lite-task-audio |Xamarin.TensorFlow.Lite.Task.Audio.Library | -| 656|org.tensorflow:tensorflow-lite-task-audio-play-services |Xamarin.TensorFlow.Lite.Task.Audio.PlayServices.Library | -| 657|org.tensorflow:tensorflow-lite-task-base |Xamarin.TensorFlow.Lite.Task.Base.Library | -| 658|org.tensorflow:tensorflow-lite-task-text |Xamarin.TensorFlow.Lite.Task.Text.Library | -| 659|org.tensorflow:tensorflow-lite-task-text-play-services |Xamarin.TensorFlow.Lite.Task.Text.PlayServices.Library | -| 660|org.tensorflow:tensorflow-lite-task-vision |Xamarin.TensorFlow.Lite.Task.Vision.Library | -| 661|org.tensorflow:tensorflow-lite-task-vision-play-services |Xamarin.TensorFlow.Lite.Task.Vision.PlayServices.Library | +| 640|org.jetbrains.kotlinx:kotlinx-serialization-protobuf-jvm |Xamarin.KotlinX.Serialization.Protobuf.Jvm | +| 641|org.jspecify:jspecify |Xamarin.JSpecify | +| 642|org.ow2.asm:asm |Xamarin.OW2.ASM | +| 643|org.reactivestreams:reactive-streams |Xamarin.Android.ReactiveStreams | +| 644|org.tensorflow:tensorflow-android |Xamarin.TensorFlow.Android | +| 645|org.tensorflow:tensorflow-lite |Xamarin.TensorFlow.Lite | +| 646|org.tensorflow:tensorflow-lite-api |Xamarin.TensorFlow.Lite.Api | +| 647|org.tensorflow:tensorflow-lite-gpu |Xamarin.TensorFlow.Lite.Gpu | +| 648|org.tensorflow:tensorflow-lite-gpu-api |Xamarin.TensorFlow.Lite.Gpu.Api | +| 649|org.tensorflow:tensorflow-lite-metadata |Xamarin.TensorFlow.Lite.Metadata | +| 650|org.tensorflow:tensorflow-lite-select-tf-ops |Xamarin.TensorFlow.Lite.Select.TF.Ops | +| 651|org.tensorflow:tensorflow-lite-support |Xamarin.TensorFlow.Lite.Support.Library | +| 652|org.tensorflow:tensorflow-lite-support-api |Xamarin.TensorFlow.Lite.Support.Api | +| 653|org.tensorflow:tensorflow-lite-task-audio |Xamarin.TensorFlow.Lite.Task.Audio.Library | +| 654|org.tensorflow:tensorflow-lite-task-audio-play-services |Xamarin.TensorFlow.Lite.Task.Audio.PlayServices.Library | +| 655|org.tensorflow:tensorflow-lite-task-base |Xamarin.TensorFlow.Lite.Task.Base.Library | +| 656|org.tensorflow:tensorflow-lite-task-text |Xamarin.TensorFlow.Lite.Task.Text.Library | +| 657|org.tensorflow:tensorflow-lite-task-text-play-services |Xamarin.TensorFlow.Lite.Task.Text.PlayServices.Library | +| 658|org.tensorflow:tensorflow-lite-task-vision |Xamarin.TensorFlow.Lite.Task.Vision.Library | +| 659|org.tensorflow:tensorflow-lite-task-vision-play-services |Xamarin.TensorFlow.Lite.Task.Vision.PlayServices.Library | From ef226133d3195670ed51283610679e70587fbcbe Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 22 Apr 2025 21:41:25 +0200 Subject: [PATCH 13/27] Update Test.cs --- .../source/Xamarin.Build.Download.Tests/Test.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Test.cs b/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Test.cs index 3fa2e8a66..b144c56ef 100644 --- a/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Test.cs +++ b/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Test.cs @@ -24,7 +24,7 @@ public class Test : TestsBase void AddCoreTargets (ProjectRootElement el) { - var baseDir = new Uri(System.Reflection.Assembly.GetExecutingAssembly().CodeBase).LocalPath; + var baseDir = new Uri(System.Reflection.Assembly.GetExecutingAssembly().Location).LocalPath; var props = Path.Combine (baseDir, "..", "..", "source", "Xamarin.Build.Download", "bin", Configuration, "netstandard20", "Xamarin.Build.Download.props"); @@ -504,7 +504,7 @@ public void TestGetItemsToDownload () var itemToDownload = project.GetItems ("XamarinBuildDownloadItemToDownload"); - Assert.Equal (1, itemToDownload.Count); + Assert.Single (itemToDownload); Assert.True (itemToDownload.First ().GetMetadata ("Url").EvaluatedValue == itemUrl); } @@ -543,7 +543,7 @@ public void TestDeduplicateGetItemsToDownload () var itemToDownload = project.GetItems ("XamarinBuildDownloadItemToDownload"); - Assert.Equal (1, itemToDownload.Count); + Assert.Single (itemToDownload); Assert.True (itemToDownload.First ().GetMetadata ("Url").EvaluatedValue == itemUrl); } From b021f2353f9326ef9e06edf24e80e1e4ad0100d2 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 23 Apr 2025 07:42:51 +0200 Subject: [PATCH 14/27] downgraded Microsoft.NET.Test.Sdk because of timeouts --- .../Xamarin.Build.Download.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj b/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj index a6cf5668b..ecf922047 100644 --- a/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj +++ b/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj @@ -12,7 +12,7 @@ - + From 817f1062033945561eb42734483e58e150315676 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 24 Apr 2025 14:04:47 +0200 Subject: [PATCH 15/27] reverting versions to work around hangs --- .../Xamarin.Build.Download.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj b/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj index ecf922047..15c1aa2ef 100644 --- a/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj +++ b/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj @@ -14,8 +14,8 @@ - - + + all runtime; build; native; contentfiles; analyzers From 4bbd3ccf2a8d187c51f153e80fd5440cce6dedad Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 25 Apr 2025 23:00:00 +0200 Subject: [PATCH 16/27] cake --- build/ci/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/build.yml b/build/ci/build.yml index 3edd5405e..e8468dd96 100644 --- a/build/ci/build.yml +++ b/build/ci/build.yml @@ -11,7 +11,7 @@ parameters: installAndroidDependencies: false tools: # Additional .NET global tools to install - - 'Cake.Tool': '4.0.0' + - 'Cake.Tool': '5.0.0' - 'private-api-tools': '1.0.3' # Reporting/Analysis Parameters From 358c5e4ffc1033e50924dc654c6c1979c3cf80b3 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 25 Apr 2025 23:00:17 +0200 Subject: [PATCH 17/27] dotnetNextVersion version bump --- build/ci/variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/variables.yml b/build/ci/variables.yml index 419497901..d62f3385c 100644 --- a/build/ci/variables.yml +++ b/build/ci/variables.yml @@ -35,7 +35,7 @@ variables: extendedTestAssembly: tests/extended/bin/$(configuration)/net8.0/ExtendedTests.dll # Extended tests compiled binary # dotnet-next test variables - dotnetNextVersion: 9.0.201 # .NET preview version to install + dotnetNextVersion: 9.0.203 # .NET preview version to install dotnetNextFrameworkVersion: 9 # The number to use for TF (eg: net9.0-android) dotnetNextApiLevel: 35 # The Android SDK API Level to use (eg: -android35.0) From 3658c732af69a6209276641f3393ff5e27f5476c Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 26 Apr 2025 09:19:35 +0200 Subject: [PATCH 18/27] trim trailing ws --- tests/extended/TestAllIndividualPackages.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/extended/TestAllIndividualPackages.cs b/tests/extended/TestAllIndividualPackages.cs index cb501e252..e37613e8c 100644 --- a/tests/extended/TestAllIndividualPackages.cs +++ b/tests/extended/TestAllIndividualPackages.cs @@ -92,14 +92,14 @@ async Task TestPackage (string id, string version, string template) // - Replace with the maximum version some packages require // - Remove the target frameworks that are not 'android' var proj_file = Directory.GetFiles (case_dir, "*.csproj").FirstOrDefault (); - + if (proj_file is not null) { - + XmlDocument xd = new (); xd.Load (proj_file); XmlNodeList? nl = xd.SelectNodes("//*[starts-with(name(), 'TargetFramework')]"); - + if (nl is not null) { foreach (XmlNode node in nl) { node.InnerText = $"{net_version}-android"; From 6984d96ce42e83016b430fb1a5d7b81e62cc3c16 Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 26 Apr 2025 09:21:30 +0200 Subject: [PATCH 19/27] merge typo fix --- tests/extended/TestAllIndividualPackages.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/extended/TestAllIndividualPackages.cs b/tests/extended/TestAllIndividualPackages.cs index e37613e8c..c42d29d44 100644 --- a/tests/extended/TestAllIndividualPackages.cs +++ b/tests/extended/TestAllIndividualPackages.cs @@ -105,6 +105,7 @@ async Task TestPackage (string id, string version, string template) node.InnerText = $"{net_version}-android"; } } + xd.Save(proj_file); ReplaceInFile (proj_file, ">21", $">{platform_version}"); ReplaceInFile (proj_file, ">21.0", $">{platform_version}"); From fa2974b03e371258b67445a0c0b50d1fe5a61d10 Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 26 Apr 2025 16:28:46 +0200 Subject: [PATCH 20/27] Update job-extended-tests.yml --- build/ci/job-extended-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/job-extended-tests.yml b/build/ci/job-extended-tests.yml index bb798edf9..e0dd2ed78 100644 --- a/build/ci/job-extended-tests.yml +++ b/build/ci/job-extended-tests.yml @@ -12,7 +12,7 @@ parameters: tools: # Additional .NET global tools to install - 'dotnet-test-slicer' : '0.1.0-alpha7' - - 'Cake.Tool': '4.0.0' + - 'Cake.Tool': '5.0.0' jobs: - job: ${{ parameters.jobName }}_package_tests From 97b2ca64433cebddb2b8fc41f976566e059c4eca Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 26 Apr 2025 16:35:49 +0200 Subject: [PATCH 21/27] tool installation --- build/ci/setup-environment.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/ci/setup-environment.yml b/build/ci/setup-environment.yml index c0c765413..7fc63fcf5 100644 --- a/build/ci/setup-environment.yml +++ b/build/ci/setup-environment.yml @@ -25,7 +25,9 @@ steps: - ${{ each tool in parameters.dotnetTools }}: - ${{ each pair in tool }}: - - pwsh: dotnet tool update -g ${{ pair.key }} --version ${{ pair.value }} + - pwsh: | + dotnet tool uninstall -g ${{ pair.key }} --version ${{ pair.value }} + dotnet tool install -g ${{ pair.key }} --version ${{ pair.value }} displayName: 'Install tool: ${{ pair.key }}' - ${{ if eq(parameters.runDotnetNextTest, true) }}: From 86ebe5967ba7c7d7f9c6f4814b942917d63737f4 Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 26 Apr 2025 16:41:12 +0200 Subject: [PATCH 22/27] Update setup-environment.yml --- build/ci/setup-environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/ci/setup-environment.yml b/build/ci/setup-environment.yml index 7fc63fcf5..90f9fb104 100644 --- a/build/ci/setup-environment.yml +++ b/build/ci/setup-environment.yml @@ -26,8 +26,8 @@ steps: - ${{ each tool in parameters.dotnetTools }}: - ${{ each pair in tool }}: - pwsh: | - dotnet tool uninstall -g ${{ pair.key }} --version ${{ pair.value }} - dotnet tool install -g ${{ pair.key }} --version ${{ pair.value }} + dotnet tool uninstall -g ${{ pair.key }} --version ${{ pair.value }} + dotnet tool install -g ${{ pair.key }} --version ${{ pair.value }} displayName: 'Install tool: ${{ pair.key }}' - ${{ if eq(parameters.runDotnetNextTest, true) }}: From 6e9b7a927f2b3c0aeded36cd934028e3f7d7b4b6 Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 26 Apr 2025 17:05:08 +0200 Subject: [PATCH 23/27] cake 4.2.0 attempt --- build/ci/build.yml | 2 +- build/ci/job-extended-tests.yml | 2 +- build/ci/setup-environment.yml | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build/ci/build.yml b/build/ci/build.yml index e8468dd96..c6f60fd90 100644 --- a/build/ci/build.yml +++ b/build/ci/build.yml @@ -11,7 +11,7 @@ parameters: installAndroidDependencies: false tools: # Additional .NET global tools to install - - 'Cake.Tool': '5.0.0' + - 'Cake.Tool': '4.2.0' - 'private-api-tools': '1.0.3' # Reporting/Analysis Parameters diff --git a/build/ci/job-extended-tests.yml b/build/ci/job-extended-tests.yml index e0dd2ed78..2880da995 100644 --- a/build/ci/job-extended-tests.yml +++ b/build/ci/job-extended-tests.yml @@ -12,7 +12,7 @@ parameters: tools: # Additional .NET global tools to install - 'dotnet-test-slicer' : '0.1.0-alpha7' - - 'Cake.Tool': '5.0.0' + - 'Cake.Tool': '4.2.0' jobs: - job: ${{ parameters.jobName }}_package_tests diff --git a/build/ci/setup-environment.yml b/build/ci/setup-environment.yml index 90f9fb104..c0c765413 100644 --- a/build/ci/setup-environment.yml +++ b/build/ci/setup-environment.yml @@ -25,9 +25,7 @@ steps: - ${{ each tool in parameters.dotnetTools }}: - ${{ each pair in tool }}: - - pwsh: | - dotnet tool uninstall -g ${{ pair.key }} --version ${{ pair.value }} - dotnet tool install -g ${{ pair.key }} --version ${{ pair.value }} + - pwsh: dotnet tool update -g ${{ pair.key }} --version ${{ pair.value }} displayName: 'Install tool: ${{ pair.key }}' - ${{ if eq(parameters.runDotnetNextTest, true) }}: From 8866c1224a54dd1bee5ea51e26e4cd0748666cee Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 28 Apr 2025 14:58:41 +0200 Subject: [PATCH 24/27] --verbosity:diagnostic added for troubleshooting --- build/ci/setup-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/setup-environment.yml b/build/ci/setup-environment.yml index c0c765413..f352ddafa 100644 --- a/build/ci/setup-environment.yml +++ b/build/ci/setup-environment.yml @@ -25,7 +25,7 @@ steps: - ${{ each tool in parameters.dotnetTools }}: - ${{ each pair in tool }}: - - pwsh: dotnet tool update -g ${{ pair.key }} --version ${{ pair.value }} + - pwsh: dotnet tool update -g ${{ pair.key }} --version ${{ pair.value }} --verbosity:diagnostic displayName: 'Install tool: ${{ pair.key }}' - ${{ if eq(parameters.runDotnetNextTest, true) }}: From 10188574d0e05bc0d36809b70cb5a252f3a86534 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 28 Apr 2025 15:17:55 +0200 Subject: [PATCH 25/27] 'Cake.Tool': '5.0.0' --- build/ci/build.yml | 2 +- build/ci/job-extended-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/ci/build.yml b/build/ci/build.yml index c6f60fd90..e8468dd96 100644 --- a/build/ci/build.yml +++ b/build/ci/build.yml @@ -11,7 +11,7 @@ parameters: installAndroidDependencies: false tools: # Additional .NET global tools to install - - 'Cake.Tool': '4.2.0' + - 'Cake.Tool': '5.0.0' - 'private-api-tools': '1.0.3' # Reporting/Analysis Parameters diff --git a/build/ci/job-extended-tests.yml b/build/ci/job-extended-tests.yml index 2880da995..e0dd2ed78 100644 --- a/build/ci/job-extended-tests.yml +++ b/build/ci/job-extended-tests.yml @@ -12,7 +12,7 @@ parameters: tools: # Additional .NET global tools to install - 'dotnet-test-slicer' : '0.1.0-alpha7' - - 'Cake.Tool': '4.2.0' + - 'Cake.Tool': '5.0.0' jobs: - job: ${{ parameters.jobName }}_package_tests From e7b96ab199f9d215c9e095c7962baa4e4eee567a Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 28 Apr 2025 17:41:54 +0200 Subject: [PATCH 26/27] another mac agent --- build/ci/variables.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/ci/variables.yml b/build/ci/variables.yml index d62f3385c..32f3402ca 100644 --- a/build/ci/variables.yml +++ b/build/ci/variables.yml @@ -16,7 +16,8 @@ variables: windowsImage: 1ESPT-Windows2022 # Windows VM image name # macOS specific variables - macosAgentPoolName: VSEng-VSMac-Xamarin-Shared # macOS VM pool name + # macosAgentPoolName: VSEng-VSMac-Xamarin-Shared # macOS VM pool name + macosAgentPoolName: macOS-latest # macOS VM pool name # Tool variables dotnetVersion: '8.0.408' # .NET version to install on agent From 2a7dd8e8e45e8c41cc6afa1f8a93c3ba888d2f84 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 28 Apr 2025 19:47:42 +0200 Subject: [PATCH 27/27] Update variables.yml --- build/ci/variables.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/ci/variables.yml b/build/ci/variables.yml index 32f3402ca..d62f3385c 100644 --- a/build/ci/variables.yml +++ b/build/ci/variables.yml @@ -16,8 +16,7 @@ variables: windowsImage: 1ESPT-Windows2022 # Windows VM image name # macOS specific variables - # macosAgentPoolName: VSEng-VSMac-Xamarin-Shared # macOS VM pool name - macosAgentPoolName: macOS-latest # macOS VM pool name + macosAgentPoolName: VSEng-VSMac-Xamarin-Shared # macOS VM pool name # Tool variables dotnetVersion: '8.0.408' # .NET version to install on agent