Move official build to use 1ES PT templates

ci/azure-pipelines-public.yaml

@@ -210,7 +210,7 @@ stages:
         pathToPublish: $(Build.ArtifactStagingDirectory)
 
 - stage: test
-  condition: and(ne('${{ variables._RunAsInternal }}', 'True'), succeeded('build_artifacts'))
+  condition: succeeded('build_artifacts')
   dependsOn: build_artifacts
   jobs:
   - job: linux_test
@@ -332,12 +332,8 @@ stages:
       - job: package
         displayName: Create NuGet packages
         pool:
-          ${{ if eq(variables['_RunAsInternal'], 'False') }}:
           name: NetCore-Public
           demands: ImageOverride -equals windows.vs2019.amd64.open
-          ${{ if eq(variables['_RunAsInternal'], 'True') }}:
-            name: NetCore1ESPool-Internal
-            demands: ImageOverride -equals windows.vs2019.amd64
         workspace:
           clean: all
         steps:
@@ -537,14 +533,3 @@ stages:
           inputs:
             artifactName: 'NuGet'
             pathToPublish: $(NuGetPackagesDir)
-
-############ POST BUILD ARCADE LOGIC ############
-- ${{ if eq(variables['_RunAsInternal'], 'True') }}:
-  - template: /eng/common/templates/post-build/post-build.yml
-    parameters:
-      validateDependsOn: build_package
-      publishingInfraVersion: 3
-      enableSourceLinkValidation: false
-      enableSigningValidation: false
-      enableSymbolValidation: false
-      enableNugetValidation: true

ci/azure-pipelines.yaml

@@ -4,114 +4,132 @@ trigger:
       - main
       - release/*
 
-pr:
-  branches:
-    include:
-    - main
-    - release/*
+pr: none
 
 variables:
-  - template: /ci/common-variables.yml
+  - template: /ci/common-variables.yml@self
+  - template: /eng/common/templates-official/variables/pool-providers.yml@self
 
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    sdl:
+      sourceAnalysisPool:
+        name: $(DncEngInternalBuildPool)
+        image: 1es-windows-2022
+        os: windows
     stages:
     - stage: build_artifacts
       jobs:
       - job: linux_build_host
         displayName: Build for Linux
         pool:
-      vmImage: '$(LinuxPool)'
+          name: $(DncEngInternalBuildPool)
+          image: '$(LinuxPool)'
+          os: linux
         workspace:
           clean: all
         steps:
-    - template: templates/linux-common.yaml
+        - template: /ci/templates/linux-common.yaml@self
 
         - bash: |
             CC=gcc$(LinuxCompilerSuffix) CXX=g++$(LinuxCompilerSuffix) ./build.sh $(BuildScriptCommonOptions) host
           displayName: Build
 
-    - template: templates/pack-artifact.yaml
+        - template: /ci/templates/pack-artifact.yaml@self
           parameters:
             buildDir: '$(LinuxHostX64BuildDir)'
             archiveName: '$(LinuxHostX64ArchiveName)'
             displayName: 'Archive Linux host X86-64 build'
 
-    - template: templates/pack-artifact.yaml
+        - template: /ci/templates/pack-artifact.yaml@self
           parameters:
             buildDir: '$(LinuxHostArm64BuildDir)'
             archiveName: '$(LinuxHostArm64ArchiveName)'
             displayName: 'Archive Linux host ARM64 build'
 
-    - template: templates/pack-artifact.yaml
+        - template: /ci/templates/pack-artifact.yaml@self
           parameters:
             buildDir: '$(LinuxHostArm32BuildDir)'
             archiveName: '$(LinuxHostArm32ArchiveName)'
             displayName: 'Archive Linux host ARM32 (Hard Float) build'
 
-    - template: templates/pack-artifact.yaml
+        - template: /ci/templates/pack-artifact.yaml@self
           parameters:
             buildDir: '$(LinuxHostArmv6BuildDir)'
             archiveName: '$(LinuxHostArmv6ArchiveName)'
             displayName: 'Archive Linux host ARMv6 build'
 
-    - task: PublishBuildArtifacts@1
+        - task: 1ES.PublishBuildArtifacts@1
           displayName: Upload Artifacts
           inputs:
-        artifactName: 'Host'
-        pathToPublish: $(Build.ArtifactStagingDirectory)
+            ArtifactName: 'Host'
+            PathtoPublish: $(Build.ArtifactStagingDirectory)
 
       - job: linux_build_android
         displayName: Build for Android
         pool:
-      vmImage: '$(LinuxPool)'
+          name: $(DncEngInternalBuildPool)
+          image: '$(LinuxPool)'
+          os: linux
         workspace:
           clean: all
         steps:
-    - template: templates/linux-common.yaml
+        - template: /ci/templates/linux-common.yaml@self
 
         - bash: |
             ./build.sh $(BuildScriptCommonOptions) --ndk $(ANDROID_NDK_HOME) android
           displayName: Build
 
-    - template: templates/pack-artifact.yaml
+        - template: /ci/templates/pack-artifact.yaml@self
           parameters:
             buildDir: '$(AndroidArm32BuildDir)'
             archiveName: '$(AndroidArm32ArchiveName)'
             displayName: 'Archive Android ARM32 build'
 
-    - template: templates/pack-artifact.yaml
+        - template: /ci/templates/pack-artifact.yaml@self
           parameters:
             buildDir: '$(AndroidArm64BuildDir)'
             archiveName: '$(AndroidArm64ArchiveName)'
             displayName: 'Archive Android ARM64 build'
 
-    - template: templates/pack-artifact.yaml
+        - template: /ci/templates/pack-artifact.yaml@self
           parameters:
             buildDir: '$(AndroidX86BuildDir)'
             archiveName: '$(AndroidX86ArchiveName)'
             displayName: 'Archive Android x86 build'
 
-    - template: templates/pack-artifact.yaml
+        - template: /ci/templates/pack-artifact.yaml@self
           parameters:
             buildDir: '$(AndroidX64BuildDir)'
             archiveName: '$(AndroidX64ArchiveName)'
             displayName: 'Archive Android x86_64 build'
 
-    - task: PublishBuildArtifacts@1
+        - task: 1ES.PublishBuildArtifacts@1
           displayName: Upload Artifacts
           inputs:
-        artifactName: 'Android'
-        pathToPublish: $(Build.ArtifactStagingDirectory)
+            ArtifactName: 'Android'
+            PathtoPublish: $(Build.ArtifactStagingDirectory)
 
       - job: mac_build_host
         displayName: Build for macOS
         pool:
+          name: Azure Pipelines
           vmImage: '$(MacPool)'
+          os: macOS
         workspace:
           clean: all
         steps:
-    - template: templates/mac-common.yaml
+        - template: /ci/templates/mac-common.yaml@self
 
-    - template: templates/mac-build.yaml
+        - template: /ci/templates/mac-build.yaml@self
           parameters:
             buildTarget: 'host'
             x64BuildDir: $(MacHostX64BuildDir)
@@ -123,13 +141,15 @@ stages:
       - job: mac_build_catalyst
         displayName: Build for macOS Catalyst
         pool:
+          name: Azure Pipelines
           vmImage: '$(MacPool)'
+          os: macOS
         workspace:
           clean: all
         steps:
-    - template: templates/mac-common.yaml
+        - template: /ci/templates/mac-common.yaml@self
 
-    - template: templates/mac-build.yaml
+        - template: /ci/templates/mac-build.yaml@self
           parameters:
             buildTarget: 'catalyst'
             x64BuildDir: $(MacCatalystX64BuildDir)
@@ -141,13 +161,15 @@ stages:
       - job: mac_build_ios
         displayName: Build for iOS
         pool:
+          name: Azure Pipelines
           vmImage: '$(MacPool)'
+          os: macOS
         workspace:
           clean: all
         steps:
-    - template: templates/mac-common.yaml
+        - template: /ci/templates/mac-common.yaml@self
 
-    - template: templates/ios-build.yaml
+        - template: /ci/templates/ios-build.yaml@self
           parameters:
             buildDirArm64: '$(MacIOSArm64BuildDir)'
             buildDirArmV7: '$(MacIOSArmV7BuildDir)'
@@ -164,13 +186,15 @@ stages:
       - job: mac_build_tvos
         displayName: Build for tvOS
         pool:
+          name: Azure Pipelines
           vmImage: '$(MacPool)'
+          os: macOS
         workspace:
           clean: all
         steps:
-    - template: templates/mac-common.yaml
+        - template: /ci/templates/mac-common.yaml@self
 
-    - template: templates/tvos-build.yaml
+        - template: /ci/templates/tvos-build.yaml@self
           parameters:
             buildDirArm64: '$(MacTVOSArm64BuildDir)'
             buildDirSimX64: '$(MacTVOSSimX64BuildDir)'
@@ -181,145 +205,40 @@ stages:
       - job: mac_build_managed
         displayName: Build managed
         pool:
+          name: Azure Pipelines
           vmImage: '$(MacPool)'
+          os: macOS
         workspace:
           clean: all
         steps:
-    - template: templates/mac-common.yaml
+        - template: /ci/templates/mac-common.yaml@self
 
         - bash: |
             ./build.sh $(BuildScriptCommonOptions) managed
           displayName: Build
 
-    - template: templates/pack-artifact.yaml
+        - template: /ci/templates/pack-artifact.yaml@self
           parameters:
             buildDir: '$(ManagedBuildDir)'
             archiveName: '$(ManagedArchiveName)'
             displayName: 'Archive Managed code'
 
-    - template: templates/pack-artifact.yaml
+        - template: /ci/templates/pack-artifact.yaml@self
           parameters:
             buildDir: '$(ManagedLogsDir)'
             archiveName: '$(ManagedLogsArchiveName)'
             displayName: 'Archive Managed build logs'
 
-    - task: PublishBuildArtifacts@1
+        - task: 1ES.PublishBuildArtifacts@1
           displayName: Upload Artifacts
           inputs:
-        artifactName: 'Managed'
-        pathToPublish: $(Build.ArtifactStagingDirectory)
-
-- stage: test
-  condition: and(ne('${{ variables._RunAsInternal }}', 'True'), succeeded('build_artifacts'))
-  dependsOn: build_artifacts
-  jobs:
-  - job: linux_test
-    displayName: Test Linux
-    pool:
-      vmImage: '$(LinuxPool)'
-    workspace:
-      clean: all
-    steps:
-    - template: templates/linux-common.yaml
-
-    - task: DownloadBuildArtifacts@0
-      displayName: Download host build artifacts
-      inputs:
-        artifactName: 'Host'
-        downloadPath: $(Build.ArtifactStagingDirectory)
-
-    - task: DownloadBuildArtifacts@0
-      displayName: Download managed build artifacts
-      inputs:
-        artifactName: 'Managed'
-        downloadPath: $(Build.ArtifactStagingDirectory)
-
-    - template: templates/extract-artifact.yaml
-      parameters:
-        displayName: Extract Linux host X86-64 build
-        artifactName: 'Host'
-        archiveName: '$(LinuxHostX64ArchiveName)'
-        destinationFolder: '$(LinuxHostX64BuildDir)'
-
-    - template: templates/extract-artifact.yaml
-      parameters:
-        displayName: Extract Managed build
-        artifactName: 'Managed'
-        archiveName: '$(ManagedArchiveName)'
-        destinationFolder: '$(ManagedBuildDir)'
-
-    - bash: |
-        ./build.sh $(BuildScriptCommonOptions) --no-build test
-      displayName: Run tests
-      continueOnError: true
-
-    - task: PublishTestResults@2
-      inputs:
-        testResultsFormat: 'VSTest'
-        testResultsFiles: '$(ManagedTestResultsDir)/**/*.trx'
-        testRunTitle: 'Linux tests'
-
-    - template: templates\fail-on-issue.yaml
-
-  - job: mac_test
-    displayName: Test macOS
-    pool:
-      vmImage: '$(MacPool)'
-    workspace:
-      clean: all
-    steps:
-    - template: templates/mac-common.yaml
-
-    - task: DownloadBuildArtifacts@0
-      displayName: Download host build artifacts
-      inputs:
-        artifactName: 'Host'
-        downloadPath: $(Build.ArtifactStagingDirectory)
-
-    - task: DownloadBuildArtifacts@0
-      displayName: Download managed build artifacts
-      inputs:
-        artifactName: 'Managed'
-        downloadPath: $(Build.ArtifactStagingDirectory)
-
-    - template: templates/extract-artifact.yaml
-      parameters:
-        displayName: Extract macOS arm64 host build
-        artifactName: 'Host'
-        archiveName: '$(MacHostArm64ArchiveName)'
-        destinationFolder: '$(MacHostArm64BuildDir)'
-
-    - template: templates/extract-artifact.yaml
-      parameters:
-        displayName: Extract macOS x64 host build
-        artifactName: 'Host'
-        archiveName: '$(MacHostX64ArchiveName)'
-        destinationFolder: '$(MacHostX64BuildDir)'
-
-    - template: templates/extract-artifact.yaml
-      parameters:
-        displayName: Extract Managed build
-        artifactName: 'Managed'
-        archiveName: '$(ManagedArchiveName)'
-        destinationFolder: '$(ManagedBuildDir)'
-
-    - bash: |
-        ./build.sh $(BuildScriptCommonOptions) --no-build test
-      displayName: Run tests
-      continueOnError: true
-
-    - task: PublishTestResults@2
-      inputs:
-        testResultsFormat: 'VSTest'
-        testResultsFiles: '$(ManagedTestResultsDir)/**/*.trx'
-        testRunTitle: 'macOS tests'
-
-    - template: templates\fail-on-issue.yaml
+            ArtifactName: 'Managed'
+            PathtoPublish: $(Build.ArtifactStagingDirectory)
 
     - stage: build_package
       dependsOn: build_artifacts
       jobs:
-  - template: /eng/common/templates/jobs/jobs.yml
+      - template: /eng/common/templates-official/jobs/jobs.yml@self
         parameters:
           enableMicrobuild: true
           enablePublishBuildArtifacts: true
@@ -332,12 +251,9 @@ stages:
           - job: package
             displayName: Create NuGet packages
             pool:
-          ${{ if eq(variables['_RunAsInternal'], 'False') }}:
-            name: NetCore-Public
-            demands: ImageOverride -equals windows.vs2019.amd64.open
-          ${{ if eq(variables['_RunAsInternal'], 'True') }}:
-            name: NetCore1ESPool-Internal
-            demands: ImageOverride -equals windows.vs2019.amd64
+              name: $(DncEngInternalBuildPool)
+              image: windows.vs2019.amd64
+              os: windows
             workspace:
               clean: all
             steps:
@@ -382,147 +298,147 @@ stages:
                 artifactName: 'Managed'
                 downloadPath: $(Build.ArtifactStagingDirectory)
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract Linux host X86-64 build
                 artifactName: 'Host'
                 archiveName: '$(LinuxHostX64ArchiveName)'
                 destinationFolder: '$(LinuxHostX64BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract Linux host ARM64 build
                 artifactName: 'Host'
                 archiveName: '$(LinuxHostArm64ArchiveName)'
                 destinationFolder: '$(LinuxHostArm64BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract Linux host ARM32 build
                 artifactName: 'Host'
                 archiveName: '$(LinuxHostArm32ArchiveName)'
                 destinationFolder: '$(LinuxHostArm32BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract Linux host ARMv6 build
                 artifactName: 'Host'
                 archiveName: '$(LinuxHostArmv6ArchiveName)'
                 destinationFolder: '$(LinuxHostArmv6BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract macOS arm64 host build
                 artifactName: 'Host'
                 archiveName: '$(MacHostArm64ArchiveName)'
                 destinationFolder: '$(MacHostArm64BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract macOS x64 host build
                 artifactName: 'Host'
                 archiveName: '$(MacHostX64ArchiveName)'
                 destinationFolder: '$(MacHostX64BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract macOS Catalyst x64 build
                 artifactName: 'macOS_Catalyst'
                 archiveName: '$(MacCatalystX64ArchiveName)'
                 destinationFolder: '$(MacCatalystX64BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract macOS Catalyst ARM64 build
                 artifactName: 'macOS_Catalyst'
                 archiveName: '$(MacCatalystArm64ArchiveName)'
                 destinationFolder: '$(MacCatalystArm64BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract macOS arm64 host build
                 artifactName: 'Host'
                 archiveName: '$(MacHostArm64ArchiveName)'
                 destinationFolder: '$(MacHostArm64BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract Android ARM32 build
                 artifactName: 'Android'
                 archiveName: '$(AndroidArm32ArchiveName)'
                 destinationFolder: '$(AndroidArm32BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract Android ARM64 build
                 artifactName: 'Android'
                 archiveName: '$(AndroidArm64ArchiveName)'
                 destinationFolder: '$(AndroidArm64BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract Android x86 build
                 artifactName: 'Android'
                 archiveName: '$(AndroidX86ArchiveName)'
                 destinationFolder: '$(AndroidX86BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract Android x86_64 build
                 artifactName: 'Android'
                 archiveName: '$(AndroidX64ArchiveName)'
                 destinationFolder: '$(AndroidX64BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract iOS ARM64 build
                 artifactName: 'iOS'
                 archiveName: '$(MacIOSArm64ArchiveName)'
                 destinationFolder: '$(MacIOSArm64BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract iOS ARMv7 build
                 artifactName: 'iOS'
                 archiveName: '$(MacIOSArmV7ArchiveName)'
                 destinationFolder: '$(MacIOSArmV7BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract iOS ARMv7s build
                 artifactName: 'iOS'
                 archiveName: '$(MacIOSArmV7sArchiveName)'
                 destinationFolder: '$(MacIOSArmV7sBuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract iOS ARM64 Simulator build
                 artifactName: 'iOS'
                 archiveName: '$(MacIOSSimArm64ArchiveName)'
                 destinationFolder: '$(MacIOSSimArm64BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract iOS x64 Simulator build
                 artifactName: 'iOS'
                 archiveName: '$(MacIOSSimX64ArchiveName)'
                 destinationFolder: '$(MacIOSSimX64BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract tvOS ARM64 build
                 artifactName: 'tvOS'
                 archiveName: '$(MacTVOSArm64ArchiveName)'
                 destinationFolder: '$(MacTVOSArm64BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract tvOS x64 Simulator build
                 artifactName: 'tvOS'
                 archiveName: '$(MacTVOSSimX64ArchiveName)'
                 destinationFolder: '$(MacTVOSSimX64BuildDir)'
 
-        - template: /ci/templates/extract-artifact.yaml
+            - template: /ci/templates/extract-artifact.yaml@self
               parameters:
                 displayName: Extract Managed build
                 artifactName: 'Managed'
@@ -532,18 +448,16 @@ stages:
             - powershell: |
                 & eng\common\Build.ps1 -restore -build -sign -pack -publish -ci -configuration $(_BuildConfig) -projects $(Build.SourcesDirectory)\Mono.Unix.sln /p:PackageAllNativeLibs=true $(_InternalBuildArgs)
               displayName: Build 
-        - task: PublishBuildArtifacts@1
+            - task: 1ES.PublishBuildArtifacts@1
               displayName: Upload NuGets
               inputs:
-            artifactName: 'NuGet'
-            pathToPublish: $(NuGetPackagesDir)
+                ArtifactName: 'NuGet'
+                PathtoPublish: $(NuGetPackagesDir)
 
     ############ POST BUILD ARCADE LOGIC ############
-- ${{ if eq(variables['_RunAsInternal'], 'True') }}:
-  - template: /eng/common/templates/post-build/post-build.yml
+    - template: /eng/common/templates-official/post-build/post-build.yml@self
       parameters:
         validateDependsOn: build_package
-      publishingInfraVersion: 3
         enableSourceLinkValidation: false
         enableSigningValidation: false
         enableSymbolValidation: false

ci/common-variables.yml

@@ -3,18 +3,16 @@ variables:
   # Cannot use key:value syntax in root defined variables
   - name: _TeamName
     value: DotNetCore
-  - name: _RunAsPublic
-    value: True
-  - name: _RunAsInternal
-    value: False
   - name: _InternalBuildArgs
     value: ''
+  - name: MacPool
+    value: macos-12
+  - name: LinuxPool
+    value: ubuntu-20.04
 
-  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - name: _RunAsPublic
-      value: False
-    - name: _RunAsInternal
-      value: True
+  - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+    - name: LinuxPool
+      value: 1es-ubuntu-2004
     - name: _SignType
       value: real
     # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
@@ -32,10 +30,6 @@ variables:
 
   - name: BuildDirName
     value: artifacts
-  - name: LinuxPool
-    value: ubuntu-20.04
-  - name: MacPool
-    value: macos-12
   - name: LinuxCompilerSuffix
     value: -10
   - name: BuildScriptCommonOptions

ci/templates/ios-build.yaml

@@ -16,36 +16,44 @@ steps:
       ./build.sh $(BuildScriptCommonOptions) ios
     displayName: Build
 
-  - template: pack-artifact.yaml
+  - template: pack-artifact.yaml@self
     parameters:
       displayName: Archive iOS arm64 build
       buildDir: ${{ parameters.buildDirArm64 }}
       archiveName: ${{ parameters.archiveNameArm64 }}
 
-  - template: pack-artifact.yaml
+  - template: pack-artifact.yaml@self
     parameters:
       displayName: Archive iOS armv7 build
       buildDir: ${{ parameters.buildDirArmV7 }}
       archiveName: ${{ parameters.archiveNameArmV7 }}
 
-  - template: pack-artifact.yaml
+  - template: pack-artifact.yaml@self
     parameters:
       displayName: Archive iOS armv7s build
       buildDir: ${{ parameters.buildDirArmV7s }}
       archiveName: ${{ parameters.archiveNameArmV7s }}
 
-  - template: pack-artifact.yaml
+  - template: pack-artifact.yaml@self
     parameters:
       displayName: Archive iOS simulator arm64 build
       buildDir: ${{ parameters.buildDirSimArm64 }}
       archiveName: ${{ parameters.archiveNameSimArm64 }}
 
-  - template: pack-artifact.yaml
+  - template: pack-artifact.yaml@self
     parameters:
       displayName: Archive iOS simulator x64 build
       buildDir: ${{ parameters.buildDirSimX64 }}
       archiveName: ${{ parameters.archiveNameSimX64 }}
 
+  - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+    - task: 1ES.PublishBuildArtifacts@1
+      displayName: Upload Artifacts
+      inputs:
+        ArtifactName: ${{ parameters.publishArtifactName }}
+        PathtoPublish: $(Build.ArtifactStagingDirectory)
+
+  - ${{ else }}:
     - task: PublishBuildArtifacts@1
       displayName: Upload Artifacts
       inputs:

ci/templates/mac-build.yaml

@@ -11,18 +11,26 @@ steps:
       ./build.sh $(BuildScriptCommonOptions) ${{ parameters.buildTarget }}
     displayName: Build
 
-  - template: pack-artifact.yaml
+  - template: pack-artifact.yaml@self
     parameters:
       displayName: Archive macOS ${{ parameters.buildTarget }} x86_64 build
       buildDir: ${{ parameters.x64BuildDir }}
       archiveName: ${{ parameters.x64ArchiveName }}
 
-  - template: pack-artifact.yaml
+  - template: pack-artifact.yaml@self
     parameters:
       displayName: Archive macOS ${{ parameters.buildTarget }} ARM64 build
       buildDir: ${{ parameters.arm64BuildDir }}
       archiveName: ${{ parameters.arm64ArchiveName }}
 
+  - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+    - task: 1ES.PublishBuildArtifacts@1
+      displayName: Upload Artifacts
+      inputs:
+        ArtifactName: ${{ parameters.publishArtifactName }}
+        PathtoPublish: $(Build.ArtifactStagingDirectory)
+
+  - ${{ else }}:
     - task: PublishBuildArtifacts@1
       displayName: Upload Artifacts
       inputs:

ci/templates/tvos-build.yaml

@@ -10,18 +10,26 @@ steps:
       ./build.sh $(BuildScriptCommonOptions) tvos
     displayName: Build
 
-  - template: pack-artifact.yaml
+  - template: pack-artifact.yaml@self
     parameters:
       displayName: Archive tvOS arm64 build
       buildDir: ${{ parameters.buildDirArm64 }}
       archiveName: ${{ parameters.archiveNameArm64 }}
 
-  - template: pack-artifact.yaml
+  - template: pack-artifact.yaml@self
     parameters:
       displayName: Archive tvOS simulator x64 build
       buildDir: ${{ parameters.buildDirSimX64 }}
       archiveName: ${{ parameters.archiveNameSimX64 }}
 
+  - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+    - task: 1ES.PublishBuildArtifacts@1
+      displayName: Upload Artifacts
+      inputs:
+        ArtifactName: ${{ parameters.publishArtifactName }}
+        PathtoPublish: $(Build.ArtifactStagingDirectory)
+
+  - ${{ else }}:
     - task: PublishBuildArtifacts@1
       displayName: Upload Artifacts
       inputs: