From 261f6b7d8adf29b9197af8ec321e3ac9256c60cc Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Tue, 10 May 2022 14:27:08 -0500
Subject: [PATCH] [ci] Update to Classic 17.2 / .NET 6 Xamarin RC3.

---
 azure-pipelines.yml                           |  6 +--
 .../Transforms/Metadata.xml                   | 38 +++----------------
 2 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5cf32b060..adb6efb1c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,12 +9,12 @@ variables:
   AndroidBinderatorVersion: 0.5.3
   AndroidXMigrationVersion: 1.0.8
   BootsVersion: 1.1.0.712-preview2
-  DotNetVersion: 6.0.200
+  DotNetVersion: 6.0.300
   DotNet6Source: https://aka.ms/dotnet6/nuget/index.json
   NuGetOrgSource: https://api.nuget.org/v3/index.json
-  XamarinDotNetWorkloadSource: https://aka.ms/dotnet/maui/preview.13.json
+  XamarinDotNetWorkloadSource: https://aka.ms/dotnet/maui/rc.3.json
   LegacyXamarinAndroidPkg: https://aka.ms/xamarin-android-commercial-d17-0-macos
-  LegacyXamarinAndroidVsix: https://aka.ms/xamarin-android-commercial-d17-1-windows
+  LegacyXamarinAndroidVsix: https://aka.ms/xamarin-android-commercial-d17-2-windows
   BUILD_NUMBER: $(Build.BuildNumber)
   BUILD_COMMIT: $(Build.SourceVersion)
   PRE_RESTORE_PROJECTS: true  # Windows is having an issue on CI right now
diff --git a/source/Xamarin.Kotlin.StdLib/Transforms/Metadata.xml b/source/Xamarin.Kotlin.StdLib/Transforms/Metadata.xml
index cd5417566..000a7fdf4 100644
--- a/source/Xamarin.Kotlin.StdLib/Transforms/Metadata.xml
+++ b/source/Xamarin.Kotlin.StdLib/Transforms/Metadata.xml
@@ -256,58 +256,30 @@
       >
     </method>
   </add-node>
-
+  <!-- Temporary fix for https://github.com/xamarin/java.interop/issues/984 -->
   <attr
-    path="/api/package[@name='kotlin']/class[@name='UByteArray']/method[@name='set-VurrAj0' and count(parameter)=3 and parameter[1][@type='byte[]'] and parameter[2][@type='int'] and parameter[3][@type='byte']]/parameter[3]"
+    path="/api/package[@name='kotlin']/class[@name='UByteArray']/method[@name='contains-7apg3OU' and count(parameter)=1 and parameter[1][@type='byte']]/parameter[1]"
     name="type"
     >
     ubyte
   </attr>
   <attr
-    path="/api/package[@name='kotlin']/class[@name='UByteArray']/method[@name='get-w2LRezQ' and count(parameter)=2 and parameter[1][@type='byte[]'] and parameter[2][@type='int']]"
-    name="return"
-    >
-    ubyte
-  </attr>
-  <attr
-    path="/api/package[@name='kotlin']/class[@name='UIntArray']/method[@name='set-VXSXFK8' and count(parameter)=3 and parameter[1][@type='int[]'] and parameter[2][@type='int'] and parameter[3][@type='int']]/parameter[3]"
+    path="/api/package[@name='kotlin']/class[@name='UIntArray']/method[@name='contains-WZ4Q5Ns' and count(parameter)=1 and parameter[1][@type='int']]/parameter[1]"
     name="type"
     >
     uint
   </attr>
-
   <attr
-    path="/api/package[@name='kotlin']/class[@name='UIntArray']/method[@name='get-pVg5ArA' and count(parameter)=2 and parameter[1][@type='int[]'] and parameter[2][@type='int']]"
-    name="return"
-    >
-    uint
-  </attr>
-  <attr
-    path="/api/package[@name='kotlin']/class[@name='ULongArray']/method[@name='set-k8EXiF4' and count(parameter)=3 and parameter[1][@type='long[]'] and parameter[2][@type='int'] and parameter[3][@type='long']]/parameter[3]"
+    path="/api/package[@name='kotlin']/class[@name='ULongArray']/method[@name='contains-VKZWuLQ' and count(parameter)=1 and parameter[1][@type='long']]/parameter[1]"
     name="type"
     >
     ulong
   </attr>
-
   <attr
-    path="/api/package[@name='kotlin']/class[@name='ULongArray']/method[@name='get-s-VKNKU' and count(parameter)=2 and parameter[1][@type='long[]'] and parameter[2][@type='int']]"
-    name="return"
-    >
-    ulong
-  </attr>
-  <attr
-    path="/api/package[@name='kotlin']/class[@name='UShortArray']/method[@name='set-01HTLdE' and count(parameter)=3 and parameter[1][@type='short[]'] and parameter[2][@type='int'] and parameter[3][@type='short']]/parameter[3]"
+    path="/api/package[@name='kotlin']/class[@name='UShortArray']/method[@name='contains-xj2QHRw' and count(parameter)=1 and parameter[1][@type='short']]/parameter[1]"
     name="type"
     >
     ushort
   </attr>
 
-  <attr
-    path="/api/package[@name='kotlin']/class[@name='UShortArray']/method[@name='get-Mh2AYeg' and count(parameter)=2 and parameter[1][@type='short[]'] and parameter[2][@type='int']]"
-    name="return"
-    >
-    ushort
-  </attr>
-
-
 </metadata>