Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions build-tools/automation/azure-pipelines-apidocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ resources:
repositories:
- repository: 1esPipelines
type: git
name: 1ESPipelineTemplates/1ESPipelineTemplates
ref: refs/tags/release
name: 1ESPipelineTemplates/MicroBuildTemplate

parameters:
- name: apiLevel
Expand Down
19 changes: 8 additions & 11 deletions build-tools/automation/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ resources:
repositories:
- repository: 1esPipelines
type: git
name: 1ESPipelineTemplates/1ESPipelineTemplates
ref: refs/tags/release
name: 1ESPipelineTemplates/MicroBuildTemplate
- repository: yaml-templates
type: git
name: DevDiv/Xamarin.yaml-templates
Expand Down Expand Up @@ -49,16 +48,16 @@ variables:
- name: DotNetFeedCredential
value: dnceng-dotnet9
- name: MicroBuildSignType
${{ if and(or(eq(variables['Build.DefinitionName'], 'Xamarin.Android'), eq(variables['Build.DefinitionName'], 'Xamarin.Android-Private')), ne(variables['Build.Reason'], 'PullRequest')) }}:
${{ if and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'Xamarin.Android')) }}:
value: Real
${{ else }}:
value: Test

extends:
${{ if eq(variables['MicroBuildSignType'], 'Real') }}:
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
template: azure-pipelines/MicroBuild.1ES.Official.yml@1esPipelines
${{ else }}:
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@1esPipelines
parameters:
sdl:
${{ if eq('${{ parameters.Skip1ESComplianceTasks }}', 'true') }}:
Expand Down Expand Up @@ -250,24 +249,23 @@ extends:
dependsOn:
- mac_build
- linux_build
condition: and(eq(dependencies.mac_build.result, 'Succeeded'), eq(dependencies.linux_build.result, 'Succeeded'), eq(variables['MicroBuildSignType'], 'Real'))
condition: and(eq(dependencies.mac_build.result, 'Succeeded'), eq(dependencies.linux_build.result, 'Succeeded'), eq(variables['Build.DefinitionName'], 'Xamarin.Android'))
jobs:
# Check - "Xamarin.Android (Prepare .NET Release Sign Archives)"
- template: sign-artifacts/jobs/v3.yml@yaml-templates
- template: sign-artifacts/jobs/v4.yml@yaml-templates
parameters:
name: sign_net_mac_win
poolName: $(VSEngMicroBuildPool)
artifactName: $(NuGetArtifactName)
signType: $(MicroBuildSignType)
signedArtifactName: nuget-signed
usePipelineArtifactTasks: true
use1ESTemplate: true
uploadPrefix: sign-mac-win
handleUnmappedFiles: fail
timeoutInMinutes: 240

# Check - "Xamarin.Android (Prepare .NET Release Sign Linux Archive)"
- template: sign-artifacts/jobs/v3.yml@yaml-templates
- template: sign-artifacts/jobs/v4.yml@yaml-templates
parameters:
name: sign_net_linux
displayName: Sign Linux Archive
Expand All @@ -276,7 +274,6 @@ extends:
signType: $(MicroBuildSignType)
signedArtifactName: nuget-linux-signed
usePipelineArtifactTasks: true
use1ESTemplate: true
uploadPrefix: sign-linux
handleUnmappedFiles: fail
timeoutInMinutes: 120
Expand Down Expand Up @@ -395,7 +392,7 @@ extends:
arguments: -c $(XA.Build.Configuration) -bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\bootstrap.binlog
condition: and(succeeded(), eq('${{ parameters.pushXAPackagesToMaestro }}', 'true'))

- ${{ if eq(variables['MicroBuildSignType'], 'Real') }}:
- ${{ if eq(variables['Build.DefinitionName'], 'Xamarin.Android') }}:
- task: AzureCLI@2
displayName: generate and publish BAR manifest
inputs:
Expand Down
2 changes: 1 addition & 1 deletion build-tools/automation/yaml-templates/variables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ variables:
- name: VSEngMicroBuildPool
value: VSEngSS-MicroBuild2022-1ES
- name: TeamName
value: XamarinAndroid
value: .NET MAUI
- name: DotNetTargetFramework
value: net10.0
- name: DotNetStableTargetFramework
Expand Down
Loading