Merge branch 'main' into net10.0

Author: rmarinho

eng/helix.proj

@@ -3,14 +3,18 @@
     <HelixType>test/product/</HelixType>
     <HelixBuild>$(BUILD_BUILDNUMBER)</HelixBuild>
     <HelixBuild Condition="'$(HelixBuild)' == ''">default</HelixBuild>
-    <HelixTargetQueues>Windows.10.Amd64.Open;OSX.15.ARM64.Open</HelixTargetQueues>
+    <HelixTargetQueues>Windows.10.Amd64.Open;osx.15.arm64.maui.open</HelixTargetQueues>
     <Creator Condition="'$(HelixAccessToken)' == ''">maui</Creator>
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <DotNetCliPackageType>sdk</DotNetCliPackageType>
     <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
     <FailOnTestFailure>true</FailOnTestFailure>
   </PropertyGroup>
 
+  <PropertyGroup>
+     <HelixTargetQueues Condition="'$(HelixInternal)' == 'True'">Windows.10.Amd64;osx.15.arm64</HelixTargetQueues>
+  </PropertyGroup>
+
   <!-- Local build outside of Azure Pipeline -->
   <PropertyGroup Condition="'$(SYSTEM_ACCESSTOKEN)' == ''">
     <HelixTargetQueues Condition="'$(HelixTargetQueues)' == ''">

eng/helix_xharness.proj

@@ -3,8 +3,8 @@
         <HelixType>test/devices/</HelixType>
         <HelixBuild Condition="'$(HelixBuild)' == ''">$(BUILD_BUILDNUMBER)</HelixBuild>
         <HelixBuild Condition="'$(HelixBuild)' == ''">default</HelixBuild>
-        <HelixTargetQueues Condition="'$(TargetOS)' == 'ios'">osx.15.arm64.Open</HelixTargetQueues>
-        <HelixTargetQueues Condition="'$(TargetOS)' == 'maccatalyst'">osx.15.arm64.Open</HelixTargetQueues>
+        <HelixTargetQueues Condition="'$(TargetOS)' == 'ios'">osx.15.arm64.maui.open</HelixTargetQueues>
+        <HelixTargetQueues Condition="'$(TargetOS)' == 'maccatalyst'">osx.15.arm64.maui.open</HelixTargetQueues>
         <HelixTargetQueues Condition="'$(TargetOS)' == 'android'">ubuntu.2204.amd64.android.33.open</HelixTargetQueues>
         <TargetsAppleMobile Condition="'$(TargetOS)' == 'ios'">true</TargetsAppleMobile>
         <Creator Condition="'$(HelixAccessToken)' == ''">maui</Creator>

eng/pipelines/arcade/setup-test-env.yml

@@ -24,11 +24,24 @@ steps:
     skipXcode: true
 
 - script: |
-    sudo xcode-select -s /Applications/Xcode_$(REQUIRED_XCODE).app
+    echo Remove old Xamarin Settings
+    rm -f ~/Library/Preferences/Xamarin/Settings.plist
+    rm -f ~/Library/Preferences/maui/Settings.plist
+    echo Mac OS version:
+    sw_vers -productVersion
+    echo
+    echo Installed Xcode versions:
+    ls /Applications | grep 'Xcode'
+    echo
+    echo currently selected xcode:
+    xcrun xcode-select --print-path
+    echo
+    echo selecting latest xcode...
+    sudo xcode-select -s /Applications/Xcode_$(XCODE).app
     xcrun xcode-select --print-path
     xcodebuild -version
     sudo xcodebuild -license accept
-    if [[ ${XCODE_VERSION/\.*/} -ge 26 ]]; then
+    if [[ ${XCODE/\.*/} -ge 26 ]]; then
       sudo xcodebuild -downloadPlatform iOS -architectureVariant universal
     else
       sudo xcodebuild -downloadPlatform iOS

eng/pipelines/arcade/stage-build.yml

@@ -15,9 +15,15 @@ parameters:
 - name: sourceIndexParams
   type: object
   default: []
-- name: runAsPublic
+- name: publishAssets
+  type: boolean
+  default: false
+- name: enableMicrobuild
   type: boolean
   default: false
+- name: runAsPublic
+  type: boolean
+  default: true
 - name: buildProjects
   type: string
   default: '$(Build.SourcesDirectory)/Microsoft.Maui.sln'
@@ -34,17 +40,6 @@ parameters:
   - Release
 - name: buildPlatforms
   type: object
-  default:
-  - name: NetCore-Public
-    image: 1es-windows-2022
-    os: Windows
-    buildScript: $(_buildScript)
-    sln: $(buildProjects)
-  - name: Azure Pipelines
-    vmImage: $(HostedMacImage)
-    os: macOS
-    buildScript: $(_buildScriptMacOS)
-    sln: $(buildProjectsMac)
 
 stages:
 - stage: Build
@@ -56,9 +51,9 @@ stages:
       parameters:
         helixRepo: dotnet/maui
         pool: ${{ BuildPlatform }}
-        enableMicrobuild: true
+        enableMicrobuild: ${{ parameters.enableMicrobuild }}
         enablePublishUsingPipelines: true
-        enablePublishBuildAssets: true
+        enablePublishBuildAssets: ${{ parameters.publishAssets }}
         enableTelemetry: true
         enableSourceBuild: ${{ parameters.enableSourceBuild }}
         enableSourceIndex: ${{ parameters.enableSourceIndex }}

eng/pipelines/arcade/stage-device-tests.yml

@@ -17,6 +17,12 @@ parameters:
 - name: sourceIndexParams
   type: object
   default: []
+- name: publishAssets
+  type: boolean
+  default: false
+- name: enableMicrobuild
+  type: boolean
+  default: false
 - name: runAsPublic
   type: boolean
   default: true
@@ -48,9 +54,9 @@ stages:
     parameters:
       helixRepo: dotnet/maui
       pool: ${{ parameters.pool }}
-      enableMicrobuild: true
+      enableMicrobuild: ${{ parameters.enableMicrobuild }}
       enablePublishUsingPipelines: true
-      enablePublishBuildAssets: true
+      enablePublishBuildAssets: ${{ parameters.publishAssets }}
       enableTelemetry: true
       enableSourceBuild: ${{ parameters.enableSourceBuild }}
       enableSourceIndex: ${{ parameters.enableSourceIndex }}
@@ -100,14 +106,14 @@ stages:
       pool: ${{ parameters.pool }}
       enableMicrobuild: false
       enablePublishUsingPipelines: true
-      enablePublishBuildAssets: true
+      enablePublishBuildAssets: ${{ parameters.publishAssets }}
       enableTelemetry: true
       enableSourceBuild: ${{ parameters.enableSourceBuild }}
       enableSourceIndex: ${{ parameters.enableSourceIndex }}
       sourceIndexParams: ${{ parameters.sourceIndexParams }}
       publishAssetsImmediately: true
       enablePublishBuildArtifacts: true
-      enablePublishTestResults: false
+      enablePublishTestResults: true
       workspace:
         clean: all
       jobs:

eng/pipelines/arcade/stage-helix-tests.yml

@@ -15,9 +15,21 @@ parameters:
 - name: sourceIndexParams
   type: object
   default: []
+- name: publishAssets
+  type: boolean
+  default: false
+- name: enableMicrobuild
+  type: boolean
+  default: false
 - name: runAsPublic
   type: boolean
   default: true
+- name: helixInternal
+  type: string
+  default: ''
+- name: HelixAccessToken
+  type: string
+  default: ''
 - name: creator
   type: string
   default: 'maui'
@@ -35,20 +47,9 @@ parameters:
   default:
   - Debug
   - Release
-- name: buildPlatforms
+- name: helixPool
   type: object
-  default:
-  - name: NetCore-Public
-    image: 1es-windows-2022
-    os: Windows
-    buildScript: $(_helixScript)
-    sln: $(buildProjects)
-  - name: Azure Pipelines
-    vmImage: $(HostedMacImage)
-    os: macOS
-    buildScript: $(_helixScriptMacOS)
-    sln: $(buildProjectsMac)
-
+ 
 stages:
 - stage: HelixTests
   displayName: Run Helix Unit Tests
@@ -58,13 +59,10 @@ stages:
     - template: ${{ iif(eq(parameters.runAsPublic, 'true'), '/eng/common/templates/jobs/jobs.yml@self', '/eng/common/templates-official/jobs/jobs.yml@self') }}
       parameters:
         helixRepo: dotnet/maui
-        pool:
-          name: NetCore-Public
-          vmImage: 1es-windows-2022
-          os: windows
-        enableMicrobuild: true
+        pool: ${{ parameters.helixPool }}
+        enableMicrobuild: ${{ parameters.enableMicrobuild }}
         enablePublishUsingPipelines: true
-        enablePublishBuildAssets: true
+        enablePublishBuildAssets: ${{ parameters.publishAssets }}
         enableTelemetry: true
         enableSourceBuild: ${{ parameters.enableSourceBuild }}
         enableSourceIndex: ${{ parameters.enableSourceIndex }}
@@ -89,7 +87,9 @@ stages:
           - script: $(_buildScript) -restore -build -configuration ${{ BuildConfiguration }} -projects "${{ parameters.buildTaskProjects }}" /p:ArchiveTests=false /p:TreatWarningsAsErrors=$(TreatWarningsAsErrors) /bl:$(Build.Arcade.LogsPath)${{ BuildConfiguration }}/buildtasks.binlog $(_OfficialBuildIdArgs)
             displayName: 🛠️ Build BuildTasks
 
-          - script: $(_msbuildCommand) "${{ parameters.helixProject }}" -warnAsError 0 -restore /p:Configuration=${{ BuildConfiguration }} /p:TestRunNameSuffix="_${{ BuildConfiguration }}" /bl:$(Build.Arcade.LogsPath)${{ BuildConfiguration }}/helix_tests.binlog ${{ parameters.extraHelixArguments }}
+          - script: $(_msbuildCommand) "${{ parameters.helixProject }}" -warnAsError 0 -restore /p:Configuration=${{ BuildConfiguration }} /p:HelixInternal="${{ parameters.helixInternal }}" /p:TestRunNameSuffix="_${{ BuildConfiguration }}" /bl:$(Build.Arcade.LogsPath)${{ BuildConfiguration }}/helix_tests.binlog ${{ parameters.extraHelixArguments }}
             displayName: Run Helix Tests
             env:
               SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
+              HelixAccessToken: ${{ parameters.HelixAccessToken }}
+    

eng/pipelines/arcade/stage-integration-tests.yml

@@ -33,7 +33,7 @@ stages:
           useExitCodeForErrors: true
           ${{ if eq(job.testCategory, 'RunOniOS') }}:
             envVariables:
-              IOS_TEST_DEVICE: ios-simulator-64_18.0
+              IOS_TEST_DEVICE: ios-simulator-64_18.5
 
       - task: PublishTestResults@2
         inputs:
@@ -47,5 +47,4 @@ stages:
           targetPath: ${{ parameters.repoLogPath }}
           artifact: Logs - Integration Tests ${{ job.testCategory }} ${{ job.pool.os }} $(System.JobAttempt)
         condition: always()
-
-      - template: /eng/pipelines/common/fail-on-issue.yml
+      # - template: /eng/pipelines/common/fail-on-issue.yml

eng/pipelines/arcade/stage-pack.yml

@@ -17,6 +17,12 @@ parameters:
 - name: sourceIndexParams
   type: object
   default: []
+- name: publishAssets
+  type: boolean
+  default: false
+- name: enableMicrobuild
+  type: boolean
+  default: false
 - name: runAsPublic
   type: boolean
   default: true
@@ -30,9 +36,9 @@ stages:
     parameters:
       helixRepo: dotnet/maui
       pool: ${{ parameters.pool }}
-      enableMicrobuild: true
+      enableMicrobuild: ${{ parameters.enableMicrobuild }}
       enablePublishUsingPipelines: true
-      enablePublishBuildAssets: true
+      enablePublishBuildAssets: ${{ parameters.publishAssets }}
       enableTelemetry: true
       enableSourceBuild: ${{ parameters.enableSourceBuild }}
       enableSourceIndex: ${{ parameters.enableSourceIndex }}
@@ -67,12 +73,12 @@ stages:
               ${{ pair.key }}: ${{ pair.value }}
 
         # Run on public pipeline
-        - ${{ if parameters.runAsPublic }}:
+        - ${{ if not(parameters.enableMicrobuild) }}:
           - script: $(_buildScript) -restore -pack -publish $(_PublishArgs) -configuration $(_BuildConfig) /bl:$(Build.Arcade.LogsPath)/$(_BuildConfig)/pack.binlog $(_OfficialBuildIdArgs)
             displayName: Pack & Publish
 
         # Run on internal pipeline
-        - ${{ if and(not(parameters.runAsPublic) , notin(variables['Build.Reason'], 'PullRequest')) }}:
+        - ${{ if and(not(parameters.runAsPublic) , parameters.enableMicrobuild) }}:
           - script: $(_buildScript) -restore -pack -sign $(_SignArgs) -configuration $(_BuildConfig) /bl:$(Build.Arcade.LogsPath)/$(_BuildConfig)/pack.binlog $(_OfficialBuildIdArgs)
             displayName: Pack, Sign
 

eng/pipelines/azure-pipelines-internal.yml

@@ -82,6 +82,8 @@ extends:
         pool: ${{ parameters.VM_IMAGE_HOST }}
         enableSourceIndex: false
         runAsPublic: false
+        enableMicrobuild: true
+        publishAssets: true
         sourceIndexParams:
           sourceIndexBuildCommand: build.cmd -restore -build -ci /bl:$(Build.Arcade.LogsPath)sourceIndexBuild.binlog /p:OfficialBuildId=$(_BuildOfficalId) /p:_SkipUpdateBuildNumber=true
           binlogPath: $(Build.Arcade.LogsPath)sourceIndexBuild.binlog
@@ -97,6 +99,8 @@ extends:
             skipAndroidCreateAvds: true
             skipProvisioning: true
             skipXcode: true
+            base64Encode: true
+            outputVariableName: dotnetbuilds-internal-container-read-token-base64
 
     - ${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/net10.0'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')) }}:
       - template: /eng/pipelines/arcade/stage-api-scan.yml@self
@@ -118,22 +122,4 @@ extends:
         - Validate
         # This is to enable SDL runs part of Post-Build Validation Stage
         SDLValidationParameters:
-          enable: false
-
-    - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
-      - template: /eng/pipelines/arcade/stage-unit-tests.yml@self
-        parameters:
-          jobMatrix:
-          - name: win_unit_tests
-            displayName: Windows Unit Tests
-            pool: ${{ parameters.VM_IMAGE_HOST }}
-            timeout: 120
-            testOS: Windows
-          - name: mac_unit_tests
-            displayName: macOS Unit Tests
-            pool:
-              name: Azure Pipelines
-              vmImage: $(HostedMacImage)
-              os: macOS
-            timeout: 120
-            testOS: macOS
+          enable: false