[release/8.0.1xxx-preview6] Merge net8.0 to preview6

.config/dotnet-tools.json

@@ -9,13 +9,13 @@
       ]
     },
     "powershell": {
-      "version": "7.3.4",
+      "version": "7.3.5",
       "commands": [
         "pwsh"
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "8.0.0-prerelease.23312.1",
+      "version": "8.0.0-prerelease.23321.2",
       "commands": [
         "xharness"
       ]

.github/workflows/dotnet-format-daily.yml → .github/workflows/dotnet-format-daily-main.yml

@@ -15,12 +15,12 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v2
         with:
-          ref: ${{ github.head_ref }}
+          ref: main
 
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 7.0.304
+          dotnet-version: 8.x
 
       - name: Run dotnet format
         run: dotnet format .\Microsoft.Maui.sln --no-restore --exclude Templates/src BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs Graphics/src/Graphics.Win2D/W2DCanvas.cs Graphics/src/Graphics.Win2D/W2DExtensions.cs
@@ -46,3 +46,4 @@ jobs:
           assignees: rmarinho, jsuarezruiz
           reviewers: rmarinho, jsuarezruiz
           branch: housekeeping/fix-codeformatting
+          base: main

eng/Version.Details.xml

@@ -83,17 +83,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23312.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23321.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>5dabb78620cf157a43de27e8d1b84786eb1baabc</Sha>
+      <Sha>d59c983920609fddd0d378921e36388c3bae8d00</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23312.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23321.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>5dabb78620cf157a43de27e8d1b84786eb1baabc</Sha>
+      <Sha>d59c983920609fddd0d378921e36388c3bae8d00</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23312.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23321.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>5dabb78620cf157a43de27e8d1b84786eb1baabc</Sha>
+      <Sha>d59c983920609fddd0d378921e36388c3bae8d00</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>

eng/Versions.props

@@ -69,9 +69,9 @@
     <_HarfBuzzSharpVersion>2.8.2.4-preview.82</_HarfBuzzSharpVersion>
     <_SkiaSharpNativeAssetsVersion>0.0.0-commit.936270ba9372ac6c94505de44884ef4ba5d96aa2.588</_SkiaSharpNativeAssetsVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
-    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23312.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23312.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23312.1</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23321.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23321.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23321.2</MicrosoftDotNetXHarnessCLIVersion>
     <TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
     <SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
     <FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>
@@ -84,7 +84,7 @@
     <DotNetMonoManifestVersionBand>$(DotNetVersionBand)</DotNetMonoManifestVersionBand>
     <DotNetEmscriptenManifestVersionBand>$(DotNetVersionBand)</DotNetEmscriptenManifestVersionBand>
     <DotNetAndroidManifestVersionBand>$(DotNetVersionBand)</DotNetAndroidManifestVersionBand>
-    <DotNetMaciOSManifestVersionBand>$(DotNetVersionBand)</DotNetMaciOSManifestVersionBand>
-    <DotNetTizenManifestVersionBand>$(DotNetVersionBand)</DotNetTizenManifestVersionBand>
+    <DotNetMaciOSManifestVersionBand>8.0.100-preview.6</DotNetMaciOSManifestVersionBand>
+    <DotNetTizenManifestVersionBand>8.0.100-preview.6</DotNetTizenManifestVersionBand>
   </PropertyGroup>
 </Project>

eng/devices/catalyst.cake

@@ -4,7 +4,7 @@
 string TARGET = Argument("target", "Test");
 
 const string defaultVersion = "14.4";
-const string dotnetVersion = "net7.0";
+const string dotnetVersion = "net8.0";
 
 // required
 FilePath PROJECT = Argument("project", EnvironmentVariable("MAC_TEST_PROJECT") ?? "");

eng/devices/windows.cake

@@ -4,7 +4,7 @@
 string TARGET = Argument("target", "Test");
 
 const string defaultVersion = "10.0.19041";
-const string dotnetVersion = "net7.0";
+const string dotnetVersion = "net8.0";
 
 // required
 FilePath PROJECT = Argument("project", EnvironmentVariable("WINDOWS_TEST_PROJECT") ?? "");

eng/pipelines/common/ui-tests.yml

@@ -9,6 +9,7 @@ parameters:
   iosVersions: [ 'latest' ]
   provisionatorChannel: 'latest'
   agentPoolAccessToken: ''
+  runCompatibilityTests: false
   projects:
     - name: name
       desc: Human Description
@@ -64,6 +65,7 @@ stages:
           - ${{ each version in parameters.iosVersions }}:
             - ${{ if not(containsValue(project.iosVersionsExclude, version)) }}:
               - job: ios_ui_tests_${{ project.name }}_${{ replace(version, '.', '_') }}
+                timeoutInMinutes: 120 # how long to run the job before automatically cancelling
                 workspace:
                   clean: all
                 displayName: ${{ coalesce(project.desc, project.name) }} (v${{ version }})
@@ -94,6 +96,7 @@ stages:
       - ${{ each project in parameters.projects }}:
         - ${{ if ne(project.winui, '') }}:
               - job: winui_ui_tests_${{ project.name }}
+                timeoutInMinutes: 120 # how long to run the job before automatically cancelling
                 workspace:
                   clean: all
                 displayName: ${{ coalesce(project.desc, project.name) }}
@@ -116,6 +119,7 @@ stages:
       - ${{ each project in parameters.projects }}:
         - ${{ if ne(project.mac, '') }}:
               - job: mac_ui_tests_${{ project.name }}
+                timeoutInMinutes: 120 # how long to run the job before automatically cancelling
                 workspace:
                   clean: all
                 displayName: ${{ coalesce(project.desc, project.name) }}
@@ -133,72 +137,74 @@ stages:
                       provisionatorChannel: ${{ parameters.provisionatorChannel }}
                       agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
 
-  - stage: android_compatibility_ui_tests
-    displayName: Android Compatibility UITests
-    dependsOn: []
-    jobs:
-      - ${{ each project in parameters.projects }}:
-        - ${{ if ne(project.android, '') }}:
-          - ${{ each api in parameters.androidApiLevels }}:
-            - ${{ if not(containsValue(project.androidApiLevelsExclude, api)) }}:
-              - job: android_compatibility_ui_tests_${{ project.name }}_${{ api }}
-                timeoutInMinutes: 240
-                workspace:
-                  clean: all
-                displayName: ${{ coalesce(project.desc, project.name) }} (API ${{ api }})
-                pool: ${{ parameters.androidCompatibilityPool }}
-                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: ui-tests-compatibility-steps.yml
-                    parameters:
-                      platform: android
-                      provisionPlatform: macos
-                      configuration: Debug
-                      version: ${{ api }}
-                      path: ${{ project.compatibilityAndroidTestProject }}
-                      app: ${{ project.compatibilityAndroidApp }}
-                      targetSample: "dotnet-legacy-controlgallery-android"
-                      device: android-emulator-32_${{ api }}
-                      provisionatorChannel: ${{ parameters.provisionatorChannel }}
-                      agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
+  - ${{ if eq(parameters.runCompatibilityTests, true) }}:  
+    - stage: android_compatibility_ui_tests
+      displayName: Android Compatibility UITests
+      dependsOn: []
+      jobs:
+        - ${{ each project in parameters.projects }}:
+          - ${{ if ne(project.android, '') }}:
+            - ${{ each api in parameters.androidApiLevels }}:
+              - ${{ if not(containsValue(project.androidApiLevelsExclude, api)) }}:
+                - job: android_compatibility_ui_tests_${{ project.name }}_${{ api }}
+                  timeoutInMinutes: 240
+                  workspace:
+                    clean: all
+                  displayName: ${{ coalesce(project.desc, project.name) }} (API ${{ api }})
+                  pool: ${{ parameters.androidCompatibilityPool }}
+                  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: ui-tests-compatibility-steps.yml
+                      parameters:
+                        platform: android
+                        provisionPlatform: macos
+                        configuration: Debug
+                        version: ${{ api }}
+                        path: ${{ project.compatibilityAndroidTestProject }}
+                        app: ${{ project.compatibilityAndroidApp }}
+                        targetSample: "dotnet-legacy-controlgallery-android"
+                        device: android-emulator-32_${{ api }}
+                        provisionatorChannel: ${{ parameters.provisionatorChannel }}
+                        agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
 
-  - stage: ios_compatibility_ui_tests
-    displayName: iOS Compatibility UITests
-    dependsOn: []
-    jobs:
-      - ${{ each project in parameters.projects }}:
-        - ${{ if ne(project.ios, '') }}:
-          - ${{ each version in parameters.iosVersions }}:
-            - ${{ if not(containsValue(project.iosVersionsExclude, version)) }}:
-              - job: ios_compatibility_ui_tests_${{ project.name }}_${{ replace(version, '.', '_') }}
-                timeoutInMinutes: 240
-                workspace:
-                  clean: all
-                displayName: ${{ coalesce(project.desc, project.name) }} (v${{ version }})
-                pool: ${{ parameters.iosCompatibilityPool }}
-                variables:
-                  REQUIRED_XCODE: $(DEVICETESTS_REQUIRED_XCODE)
-                steps:
-                  - template: ui-tests-compatibility-steps.yml
-                    parameters:
-                      platform: ios
-                      provisionPlatform: macos
-                      configuration: Debug
-                      ${{ if eq(version, 'latest') }}:
-                        version: 16.2
-                      ${{ if ne(version, 'latest') }}:
-                        version: ${{ version }}
-                      path: ${{ project.compatibilityiOSTestProject }}
-                      app: ${{ project.compatibilityiOSApp }}
-                      targetSample: "dotnet-legacy-controlgallery-ios"
-                      ${{ if eq(version, 'latest') }}:
-                        device: ios-simulator-64
-                      ${{ if ne(version, 'latest') }}:
-                        device: ios-simulator-64_${{ version }}
-                      provisionatorChannel: ${{ parameters.provisionatorChannel }}
-                      agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
+
+    - stage: ios_compatibility_ui_tests
+      displayName: iOS Compatibility UITests
+      dependsOn: []
+      jobs:
+        - ${{ each project in parameters.projects }}:
+          - ${{ if ne(project.ios, '') }}:
+            - ${{ each version in parameters.iosVersions }}:
+              - ${{ if not(containsValue(project.iosVersionsExclude, version)) }}:
+                - job: ios_compatibility_ui_tests_${{ project.name }}_${{ replace(version, '.', '_') }}
+                  timeoutInMinutes: 240
+                  workspace:
+                    clean: all
+                  displayName: ${{ coalesce(project.desc, project.name) }} (v${{ version }})
+                  pool: ${{ parameters.iosCompatibilityPool }}
+                  variables:
+                    REQUIRED_XCODE: $(DEVICETESTS_REQUIRED_XCODE)
+                  steps:
+                    - template: ui-tests-compatibility-steps.yml
+                      parameters:
+                        platform: ios
+                        provisionPlatform: macos
+                        configuration: Debug
+                        ${{ if eq(version, 'latest') }}:
+                          version: 16.2
+                        ${{ if ne(version, 'latest') }}:
+                          version: ${{ version }}
+                        path: ${{ project.compatibilityiOSTestProject }}
+                        app: ${{ project.compatibilityiOSApp }}
+                        targetSample: "dotnet-legacy-controlgallery-ios"
+                        ${{ if eq(version, 'latest') }}:
+                          device: ios-simulator-64
+                        ${{ if ne(version, 'latest') }}:
+                          device: ios-simulator-64_${{ version }}
+                        provisionatorChannel: ${{ parameters.provisionatorChannel }}
+                        agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}

eng/pipelines/ui-tests.yml

@@ -57,6 +57,10 @@ parameters:
     type: boolean
     default: false
 
+  - name: CompatibilityTests
+    type: boolean
+    default: false
+
   - name: androidPool
     type: object
     default:
@@ -135,23 +139,9 @@ stages:
         # androidApiLevels: [ 30, 21 ] # fix the issue of getting the test results off
         iosVersions: [ 'latest' ]
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
+      ${{ if or(parameters.CompatibilityTests, ne(variables['Build.Reason'], 'PullRequest')) }}:
+        runCompatibilityTests: true
       projects:
-        # - name: essentials
-        #   desc: Essentials
-        #   androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
-        #   android: $(System.DefaultWorkingDirectory)/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
-        #   ios: $(System.DefaultWorkingDirectory)/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
-        # - name: graphics
-        #   desc: Graphics
-        #   androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
-        #   android: $(System.DefaultWorkingDirectory)/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj
-        #   ios: $(System.DefaultWorkingDirectory)/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj
-        # - name: core
-        #   desc: Core
-        #   androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
-        #   android: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
-        #   iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI
-        #   ios: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
         - name: controls
           desc: Controls
           androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
@@ -165,10 +155,4 @@ stages:
           compatibilityAndroidTestProject: $(System.DefaultWorkingDirectory)/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj
           compatibilityiOSApp: $(System.DefaultWorkingDirectory)/src/Compatibility/ControlGallery/src/iOS/Compatibility.ControlGallery.iOS.csproj 
           compatibilityiOSTestProject: $(System.DefaultWorkingDirectory)/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj
-        # - name: blazorwebview
-        #   desc: BlazorWebView
-        #   androidApiLevelsExclude: [ 27, 26, 25, 24, 23, 22, 21 ] # BlazorWebView requires a recent version of Chrome
-        #   android: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
-        #   iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI
-        #   ios: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
 

src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31366.cs

@@ -78,6 +78,7 @@ protected override void Init()
 #if UITEST
 		[Test]
 		[UiTest(typeof(NavigationPage))]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Issue31366PushingAndPoppingModallyCausesArgumentOutOfRangeException()
 		{
 			RunningApp.Tap(q => q.Marked("Start PopOnAppearing Test"));
@@ -86,6 +87,7 @@ public void Issue31366PushingAndPoppingModallyCausesArgumentOutOfRangeException(
 
 		[Test]
 		[UiTest(typeof(NavigationPage))]
+		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Issue31366PushingWithModalStackCausesIncorrectStackOrder()
 		{
 			RunningApp.Tap(q => q.Marked("Start ModalStack Test"));

src/Compatibility/ControlGallery/src/Issues.Shared/Issue1975.cs

@@ -142,6 +142,8 @@ public SubItem(string text)
 
 #if UITEST
 		[Test]
+		[Compatibility.UITests.FailsOnMauiIOS]
+		[Compatibility.UITests.FailsOnMauiAndroid]
 		public void UpdatingSourceOfDisposedListViewDoesNotCrash()
 		{
 			RunningApp.Tap(Go);