[net8.0] Merge main again

Microsoft.Maui-mac.slnf

@@ -50,6 +50,7 @@
       "src\\TestUtils\\src\\DeviceTests.Runners\\TestUtils.DeviceTests.Runners.csproj",
       "src\\TestUtils\\src\\DeviceTests\\TestUtils.DeviceTests.csproj",
       "src\\TestUtils\\src\\TestUtils\\TestUtils.csproj",
+      "src\\TestUtils\\src\\Microsoft.Maui.IntegrationTests\\Microsoft.Maui.IntegrationTests.csproj",
       "src\\TestUtils\\src\\TestUtils.Appium.UITests\\TestUtils.Appium.UITests.csproj",
       "src\\TestUtils\\src\\TestUtils.Appium\\TestUtils.Appium.csproj",
       "src\\Workload\\Microsoft.Maui.Sdk\\Microsoft.Maui.Sdk.csproj",

eng/Versions.props

@@ -54,7 +54,7 @@
     <_MicrosoftWebWebView2Version>1.0.1774.30</_MicrosoftWebWebView2Version>
     <!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
     <!-- must be kept in sync with the binding library version to it here: -->
-    <_XamarinAndroidGlideVersion>4.14.2.1</_XamarinAndroidGlideVersion>
+    <_XamarinAndroidGlideVersion>4.15.1</_XamarinAndroidGlideVersion>
     <_XamarinAndroidXSecurityVersion>1.1.0-alpha05</_XamarinAndroidXSecurityVersion>
     <_XamarinGoogleCryptoTinkAndroidVersion>1.8.0</_XamarinGoogleCryptoTinkAndroidVersion>
     <!-- Android Maps -->

eng/devices/android.cake

@@ -15,7 +15,7 @@ string DEVICE_NAME = Argument("skin", EnvironmentVariable("ANDROID_TEST_SKIN") ?
 // optional
 var USE_DOTNET = Argument("dotnet", true);
 var DOTNET_PATH = Argument("dotnet-path", EnvironmentVariable("DOTNET_PATH"));
-var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? (USE_DOTNET ? "net8.0-android" : ""));
+var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? (USE_DOTNET ? $"{dotnetVersion}-android" : ""));
 var BINLOG_ARG = Argument("binlog", EnvironmentVariable("ANDROID_TEST_BINLOG") ?? "");
 DirectoryPath BINLOG_DIR = string.IsNullOrEmpty(BINLOG_ARG) && !string.IsNullOrEmpty(PROJECT.FullPath) ? PROJECT.GetDirectory() : BINLOG_ARG;
 var TEST_APP = Argument("app", EnvironmentVariable("ANDROID_TEST_APP") ?? "");

eng/pipelines/common/device-tests.yml

@@ -16,66 +16,75 @@ parameters:
       ios: /optional/path/to/ios.csproj
 
 stages:
-
   - stage: android_device_tests
     displayName: Android Device Tests
     dependsOn: []
     jobs:
-      - ${{ each project in parameters.projects }}:
-        - ${{ if ne(project.android, '') }}:
-          - ${{ each api in parameters.androidApiLevels }}:
-            - ${{ if not(containsValue(project.androidApiLevelsExclude, api)) }}:
-              - job: android_device_tests_${{ project.name }}_${{ api }}
-                workspace:
-                  clean: all
-                displayName: ${{ coalesce(project.desc, project.name) }} (API ${{ api }})
-                pool: ${{ parameters.androidPool }}
-                variables:
-                  ${{ if ge(api, 24) }}:
-                    ANDROID_EMULATORS: "system-images;android-${{ api }};google_apis_playstore;x86"
-                  ${{ if lt(api, 24) }}:
-                    ANDROID_EMULATORS: "system-images;android-${{ api }};google_apis;x86"
-                  REQUIRED_XCODE: $(DEVICETESTS_REQUIRED_XCODE)
-                steps:
-                  - template: device-tests-steps.yml
-                    parameters:
-                      platform: android
-                      path: ${{ project.android }}
-                      device: android-emulator-32_${{ api }}
-                      provisionatorChannel: ${{ parameters.provisionatorChannel }}
-                      agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
-                      artifactName: ${{ parameters.artifactName }}
-                      artifactItemPattern: ${{ parameters.artifactItemPattern }}
-                      checkoutDirectory: ${{ parameters.checkoutDirectory }}
-                      useArtifacts: ${{ parameters.useArtifacts }}
+    - job: android_device_tests
+      workspace:
+        clean: all
+      displayName: "Android emulator tests"
+      pool: ${{ parameters.androidPool }}
+      strategy:
+        matrix:
+          # create all the variables used for the matrix
+          ${{ each project in parameters.projects }}:
+            ${{ if ne(project.android, '') }}:
+              ${{ each api in parameters.androidApiLevels }}:
+                ${{ if not(containsValue(project.androidApiLevelsExclude, api)) }}:
+                  ${{ replace(coalesce(project.desc, project.name), ' ', '_') }}_API_${{ api }}:
+                    ${{ if ge(api, 24) }}:
+                      ANDROID_EMULATORS: "system-images;android-${{ api }};google_apis_playstore;x86"
+                    ${{ else }}:
+                      ANDROID_EMULATORS: "system-images;android-${{ api }};google_apis;x86"
+                    REQUIRED_XCODE: $(DEVICETESTS_REQUIRED_XCODE)
+                    PROJECT_PATH: ${{ project.android }}
+                    DEVICE: android-emulator-32_${{ api }}
+      steps:
+        - template: device-tests-steps.yml
+          parameters:
+            platform: android
+            path: $(PROJECT_PATH) 
+            device: $(DEVICE)
+            provisionatorChannel: ${{ parameters.provisionatorChannel }}
+            agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
+            artifactName: ${{ parameters.artifactName }}
+            artifactItemPattern: ${{ parameters.artifactItemPattern }}
+            checkoutDirectory: ${{ parameters.checkoutDirectory }}
+            useArtifacts: ${{ parameters.useArtifacts }}
 
   - stage: ios_device_tests
     displayName: iOS Device Tests
     dependsOn: []
     jobs:
-      - ${{ each project in parameters.projects }}:
-        - ${{ if ne(project.ios, '') }}:
-          - ${{ each version in parameters.iosVersions }}:
-            - ${{ if not(containsValue(project.iosVersionsExclude, version)) }}:
-              - job: ios_device_tests_${{ project.name }}_${{ replace(version, '.', '_') }}
-                workspace:
-                  clean: all
-                displayName: ${{ coalesce(project.desc, project.name) }} (v${{ version }})
-                pool: ${{ parameters.iosPool }}
-                variables:
-                  REQUIRED_XCODE: $(DEVICETESTS_REQUIRED_XCODE)
-                steps:
-                  - template: device-tests-steps.yml
-                    parameters:
-                      platform: ios
-                      path: ${{ project.ios }}
-                      ${{ if eq(version, 'latest') }}:
-                        device: ios-simulator-64
-                      ${{ if ne(version, 'latest') }}:
-                        device: ios-simulator-64_${{ version }}
-                      provisionatorChannel: ${{ parameters.provisionatorChannel }}
-                      agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
-                      artifactName: ${{ parameters.artifactName }}
-                      artifactItemPattern: ${{ parameters.artifactItemPattern }}
-                      checkoutDirectory: ${{ parameters.checkoutDirectory }}
-                      useArtifacts: ${{ parameters.useArtifacts }}
+    - job: ios_device_tests
+      workspace:
+        clean: all
+      displayName: "iOS simulator tests"
+      pool: ${{ parameters.iosPool }}
+      strategy:
+        matrix:
+          # create all the variables used for the matrix
+          ${{ each project in parameters.projects }}:
+            ${{ if ne(project.ios, '') }}:
+              ${{ each version in parameters.iosVersions }}:
+                ${{ if not(containsValue(project.iosVersionsExclude, version)) }}:
+                  ${{ replace(coalesce(project.desc, project.name), ' ', '_') }}_V_${{ version }}:
+                    REQUIRED_XCODE: $(DEVICETESTS_REQUIRED_XCODE)
+                    PROJECT_PATH: ${{ project.ios }}
+                    ${{ if eq(version, 'latest') }}:
+                      DEVICE: ios-simulator-64
+                    ${{ else }}:
+                      DEVICE: ios-simulator-64_${{ version }}
+      steps:
+        - template: device-tests-steps.yml
+          parameters:
+            platform: ios
+            path: $(PROJECT_PATH)
+            device: $(DEVICE)
+            provisionatorChannel: ${{ parameters.provisionatorChannel }}
+            agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
+            artifactName: ${{ parameters.artifactName }}
+            artifactItemPattern: ${{ parameters.artifactItemPattern }}
+            checkoutDirectory: ${{ parameters.checkoutDirectory }}
+            useArtifacts: ${{ parameters.useArtifacts }}

eng/pipelines/common/ui-tests.yml

@@ -114,6 +114,8 @@ stages:
                   clean: all
                 displayName: ${{ coalesce(project.desc, project.name) }}
                 pool: ${{ parameters.macosPool }}
+                variables:
+                  REQUIRED_XCODE: 14.2.0
                 steps:
                   - template: ui-tests-steps.yml
                     parameters: