Skip to content

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

build-tools/automation/azure-pipelines-apidocs.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ resources:
1212
repositories:
1313
- repository: 1esPipelines
1414
type: git
15-
name: 1ESPipelineTemplates/1ESPipelineTemplates
16-
ref: refs/tags/release
15+
name: 1ESPipelineTemplates/MicroBuildTemplate
1716

1817
parameters:
1918
- name: apiLevel

build-tools/automation/azure-pipelines.yaml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ resources:
1313
repositories:
1414
- repository: 1esPipelines
1515
type: git
16-
name: 1ESPipelineTemplates/1ESPipelineTemplates
17-
ref: refs/tags/release
16+
name: 1ESPipelineTemplates/MicroBuildTemplate
1817
- repository: yaml-templates
1918
type: git
2019
name: DevDiv/Xamarin.yaml-templates
@@ -49,16 +48,16 @@ variables:
4948
- name: DotNetFeedCredential
5049
value: dnceng-dotnet9
5150
- name: MicroBuildSignType
52-
${{ if and(or(eq(variables['Build.DefinitionName'], 'Xamarin.Android'), eq(variables['Build.DefinitionName'], 'Xamarin.Android-Private')), ne(variables['Build.Reason'], 'PullRequest')) }}:
51+
${{ if and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'Xamarin.Android')) }}:
5352
value: Real
5453
${{ else }}:
5554
value: Test
5655

5756
extends:
5857
${{ if eq(variables['MicroBuildSignType'], 'Real') }}:
59-
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
58+
template: azure-pipelines/MicroBuild.1ES.Official.yml@1esPipelines
6059
${{ else }}:
61-
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
60+
template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@1esPipelines
6261
parameters:
6362
sdl:
6463
${{ if eq('${{ parameters.Skip1ESComplianceTasks }}', 'true') }}:
@@ -476,24 +475,23 @@ extends:
476475
dependsOn:
477476
- mac_build
478477
- linux_build
479-
condition: and(eq(dependencies.mac_build.result, 'Succeeded'), eq(dependencies.linux_build.result, 'Succeeded'), eq(variables['MicroBuildSignType'], 'Real'))
478+
condition: and(eq(dependencies.mac_build.result, 'Succeeded'), eq(dependencies.linux_build.result, 'Succeeded'), eq(variables['Build.DefinitionName'], 'Xamarin.Android'))
480479
jobs:
481480
# Check - "Xamarin.Android (Prepare .NET Release Sign Archives)"
482-
- template: sign-artifacts/jobs/v3.yml@yaml-templates
481+
- template: sign-artifacts/jobs/v4.yml@yaml-templates
483482
parameters:
484483
name: sign_net_mac_win
485484
poolName: $(VSEngMicroBuildPool)
486485
artifactName: $(NuGetArtifactName)
487486
signType: $(MicroBuildSignType)
488487
signedArtifactName: nuget-signed
489488
usePipelineArtifactTasks: true
490-
use1ESTemplate: true
491489
uploadPrefix: sign-mac-win
492490
handleUnmappedFiles: fail
493491
timeoutInMinutes: 240
494492

495493
# Check - "Xamarin.Android (Prepare .NET Release Sign Linux Archive)"
496-
- template: sign-artifacts/jobs/v3.yml@yaml-templates
494+
- template: sign-artifacts/jobs/v4.yml@yaml-templates
497495
parameters:
498496
name: sign_net_linux
499497
displayName: Sign Linux Archive
@@ -502,7 +500,6 @@ extends:
502500
signType: $(MicroBuildSignType)
503501
signedArtifactName: nuget-linux-signed
504502
usePipelineArtifactTasks: true
505-
use1ESTemplate: true
506503
uploadPrefix: sign-linux
507504
handleUnmappedFiles: fail
508505
timeoutInMinutes: 120
@@ -612,7 +609,7 @@ extends:
612609
arguments: -c $(XA.Build.Configuration) -bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\bootstrap.binlog
613610
condition: and(succeeded(), eq('${{ parameters.pushXAPackagesToMaestro }}', 'true'))
614611

615-
- ${{ if eq(variables['MicroBuildSignType'], 'Real') }}:
612+
- ${{ if eq(variables['Build.DefinitionName'], 'Xamarin.Android') }}:
616613
- task: AzureCLI@2
617614
displayName: generate and publish BAR manifest
618615
inputs:

build-tools/automation/yaml-templates/variables.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ variables:
4646
- name: VSEngMicroBuildPool
4747
value: VSEngSS-MicroBuild2022-1ES
4848
- name: TeamName
49-
value: XamarinAndroid
49+
value: .NET MAUI
5050
- name: DotNetTargetFramework
5151
value: net9.0
5252
- name: DotNetStableTargetFramework

0 commit comments

Comments
 (0)