From 823c9bf099c6fe9c4a6385407f2073c9f08125a7 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 11 Nov 2022 14:46:04 +0000 Subject: [PATCH 1/3] Add API-33 to the nightly build --- build-tools/automation/azure-pipelines-nightly.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml index a1c876a8484..ead805edc1c 100644 --- a/build-tools/automation/azure-pipelines-nightly.yaml +++ b/build-tools/automation/azure-pipelines-nightly.yaml @@ -98,6 +98,10 @@ stages: avdApiLevel: 31 avdAbi: x86_64 avdType: default + Android33-x86_64: + avdApiLevel: 33 + avdAbi: x86_64 + avdType: default pool: vmImage: $(HostedMacImage) workspace: From 5cbfa37207f605b0d270092546e748c944e5e56d Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Tue, 15 Nov 2022 12:43:57 +0000 Subject: [PATCH 2/3] try with google_apis --- build-tools/automation/azure-pipelines-nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml index ead805edc1c..8412938f218 100644 --- a/build-tools/automation/azure-pipelines-nightly.yaml +++ b/build-tools/automation/azure-pipelines-nightly.yaml @@ -101,7 +101,7 @@ stages: Android33-x86_64: avdApiLevel: 33 avdAbi: x86_64 - avdType: default + avdType: google_apis pool: vmImage: $(HostedMacImage) workspace: From 7cee70299122d52411c0062ff959970b917e8530 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 18 Nov 2022 14:05:00 +0000 Subject: [PATCH 3/3] Fix network unit test --- tests/Mono.Android-Tests/System.Net/NetworkInterfaces.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/Mono.Android-Tests/System.Net/NetworkInterfaces.cs b/tests/Mono.Android-Tests/System.Net/NetworkInterfaces.cs index 10761eb1cd7..9548ef99a3b 100644 --- a/tests/Mono.Android-Tests/System.Net/NetworkInterfaces.cs +++ b/tests/Mono.Android-Tests/System.Net/NetworkInterfaces.cs @@ -85,6 +85,9 @@ bool AddressesAreEqual (List one, List two) bool HardwareAddressesAreEqual (byte[] one, byte[] two) { + // Under API 33 .Net doesn't return the hardware address. So we need to ignore it + if (Android.OS.Build.VERSION.SdkInt == Android.OS.BuildVersionCodes.Tiramisu) + return true; if (one == two) return true; if (one == null || two == null) @@ -184,6 +187,7 @@ byte[] GetHardwareAddress (MNetworkInterface inf) // if all the bytes are zero return null like Java does. if (bytes.All (x => x == 0)) return null; + return bytes; }