[ci] Add variable group MAUI

eng/helix.proj

@@ -4,7 +4,7 @@
     <HelixBuild>$(BUILD_BUILDNUMBER)</HelixBuild>
     <HelixBuild Condition="'$(HelixBuild)' == ''">default</HelixBuild>
     <HelixTargetQueues>Windows.10.Amd64.Open;osx.15.arm64.maui.open</HelixTargetQueues>
-    <Creator Condition="'$(HelixAccessToken)' == ''">maui</Creator>
+    <Creator Condition="'$(Creator)' == ''">maui</Creator>
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <DotNetCliPackageType>sdk</DotNetCliPackageType>
     <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>

eng/pipelines/arcade/variables.yml

@@ -25,15 +25,15 @@ variables:
 - name: TreatWarningsAsErrors
   value: false
 - name: _OfficialBuildIdArgs
-  value: /p:OfficialBuildId=$(_BuildOfficalId) /p:_SkipUpdateBuildNumber=true
+  value: ''
 - name: ApiScanAppId
   value: cbde2fca-1ca1-47f7-8212-fcdf1a556eb2
 - name: ApiScanTenantId
   value: 72f988bf-86f1-41af-91ab-2d7cd011db47
 - name: ApiScanServiceConnectionId
   value: 334a6802-ebad-4fb1-bc3b-105bcc70bda2
 # Produce test-signed build for PR and Public builds
-- ${{ if or(eq(variables['_RunAsPublic'], 'true'), eq(variables['Build.Reason'], 'PullRequest')) }}:
+- ${{ if eq(variables['_RunAsPublic'], 'true') }}:
   # needed for darc (dependency flow) publishing
   - name: _PublishArgs
     value: ''
@@ -45,7 +45,7 @@ variables:
   - name: _SignArgs
     value: '/p:DotNetSignType=$(_SignType) /p:TeamName=$(TeamName)'
 # Set up non-PR build from internal project
-- ${{ if and(ne(variables['_RunAsPublic'], 'true'), ne(variables['Build.Reason'], 'PullRequest')) }}:
+- ${{ if or(eq(variables['Build.DefinitionName'], 'dotnet-maui'), eq(variables['Build.DefinitionName'], 'dotnet-maui-build')) }}:
   # needed for darc (dependency flow) publishing
   - name: _PublishArgs
     value: >-

eng/pipelines/ci-uitests.yml

@@ -46,10 +46,6 @@ variables:
 
 parameters:
 
-  - name: UseProvisionator
-    type: boolean
-    default: false
-
   - name: BuildEverything
     type: boolean
     default: false
@@ -120,10 +116,6 @@ stages:
       ${{ else }}:
         androidApiLevels: [ 30 ]
         iosVersions: [ '18.4' ]
-      ${{ if or(parameters.UseProvisionator, eq(variables['internalProvisioning'],'true') ) }}:
-        skipProvisioning: false
-      ${{ else }}:  
-        skipProvisioning: true
       projects:
         - name: controls
           desc: Controls

eng/pipelines/common/variables.yml

@@ -49,16 +49,15 @@ variables:
   value: true
 - name: _RunAsInternal
   value: false
-- name: _InternalBuildArgs
-  value: ''
 - name: cfsNugetWarnLevel
   value: warn
 - name: nugetMultiFeedWarnLevel
   value: none
 
+- group: MAUI # This is the main MAUI variable group that contains secrets for the apple certificate
+
 # Variable groups required for all builds
 - ${{ if and(ne(variables['Build.DefinitionName'], 'maui-pr'), ne(variables['Build.DefinitionName'], 'dotnet-maui'),  ne(variables['Build.DefinitionName'], 'maui-pr-devicetests'),  ne(variables['Build.DefinitionName'], 'maui-pr-uitests')) }}:
-  - group: MAUI # This is the main MAUI variable group that contains secret for the apple certificate
   - group: maui-provisionator # This is just needed for the provisionator
 
 
@@ -77,9 +76,7 @@ variables:
 
     - group: DotNetBuilds storage account read tokens
     - group: AzureDevOps-Artifact-Feeds-Pats
-    - name: _InternalBuildArgs
-      value: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) /p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
-
+
 - ${{ if eq(variables['Build.DefinitionName'], 'dotnet-maui') }}:
   - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
     # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT