refactor: Minor refactors of CI

build/ci/.azure-devops-stages-docs.yml

@@ -1,23 +1,9 @@
 
 stages:
-- stage: Setup
+- stage: setup
   displayName: Setup
   jobs:
-  - template: .azure-devops-commitsar.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
-
-  - template: .azure-devops-spell-check.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
-
-  - template: .azure-devops-markdown-lint.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
-
-  - template: .azure-devops-pipeline-validations.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
+  - template: .azure-devops-setup.yml
 
 - stage: docs_generation
   displayName: Docs Generation

build/ci/.azure-devops-stages.yml

@@ -1,28 +1,14 @@
 
 stages:
-- stage: Setup
+- stage: setup
   displayName: Setup
   jobs:
-  - template: .azure-devops-commitsar.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
-
-  - template: .azure-devops-spell-check.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
-
-  - template: .azure-devops-markdown-lint.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
-
-  - template: .azure-devops-pipeline-validations.yml
-    parameters:
-      vmImage: '$(linuxVMImage)'
+  - template: setup/.azure-devops-setup.yml
 
 - stage: convert_tree
   displayName: UWP Tree Conversion
   dependsOn:
-    - Setup
+    - setup
   jobs:
   - template: .azure-devops-uwp-convert.yml
     parameters:
@@ -31,29 +17,29 @@ stages:
 - stage: binaries_build_uwp
   displayName: Build Binaries UWP
   dependsOn:
-    - Setup
+    - setup
     - convert_tree
 
   jobs: 
-  - template: .azure-devops-package-netcoremobile.yml
+  - template: build/.azure-devops-package-netcoremobile.yml
     parameters:
       poolName: '$(windowsScaledPool)'
       UNO_UWP_BUILD: true
       XAML_FLAVOR_BUILD: UWP
 
-  - template: .azure-devops-package-wasm.yml
+  - template: build/.azure-devops-package-wasm.yml
     parameters:
       poolName: '$(linuxScaledPool)'
       UNO_UWP_BUILD: true
       XAML_FLAVOR_BUILD: UWP
 
-  - template: .azure-devops-package-reference.yml
+  - template: build/.azure-devops-package-reference.yml
     parameters:
       poolName: '$(linuxScaledPool)'
       UNO_UWP_BUILD: true
       XAML_FLAVOR_BUILD: UWP
 
-  - template: .azure-devops-package-skia.yml
+  - template: build/.azure-devops-package-skia.yml
     parameters:
       poolName: '$(linuxScaledPool)'
       macOSImageName: '$(macOSVMImage)'
@@ -63,28 +49,28 @@ stages:
 - stage: binaries_build_winui
   displayName: Build Binaries WinUI
   dependsOn:
-    - Setup
+    - setup
 
   jobs: 
-  - template: .azure-devops-package-netcoremobile.yml
+  - template: build/.azure-devops-package-netcoremobile.yml
     parameters:
       poolName: '$(windowsScaledPool)'
       UNO_UWP_BUILD: false
       XAML_FLAVOR_BUILD: WinUI
 
-  - template: .azure-devops-package-wasm.yml
+  - template: build/.azure-devops-package-wasm.yml
     parameters:
       poolName: '$(linuxScaledPool)'
       UNO_UWP_BUILD: false
       XAML_FLAVOR_BUILD: WinUI
 
-  - template: .azure-devops-package-reference.yml
+  - template: build/.azure-devops-package-reference.yml
     parameters:
       poolName: '$(linuxScaledPool)'
       UNO_UWP_BUILD: false
       XAML_FLAVOR_BUILD: WinUI
 
-  - template: .azure-devops-package-skia.yml
+  - template: build/.azure-devops-package-skia.yml
     parameters:
       poolName: '$(linuxScaledPool)'
       macOSImageName: '$(macOSVMImage)'
@@ -98,7 +84,7 @@ stages:
     - binaries_build_winui
 
   jobs: 
-  - template: .azure-devops-package.yml
+  - template: build/.azure-devops-package.yml
     parameters:
       poolName: '$(windowsScaledPool)'
 
@@ -108,7 +94,7 @@ stages:
     - packages_build
 
   jobs: 
-  - template: .azure-devops-project-template-tests.yml
+  - template: tests/.azure-devops-project-template-tests.yml
     parameters:
       poolName: '$(windowsScaledPool)'
       vmImageWindows: $(windows2022HostedVMImage)
@@ -125,7 +111,7 @@ stages:
 
   jobs:
 
-  - template: .azure-devops-unit-tests.yml
+  - template: tests/.azure-devops-unit-tests.yml
     parameters:
       poolName: '$(windowsScaledPool)'
 
@@ -136,18 +122,18 @@ stages:
 
   jobs:
 
-  - template: .azure-devops-wasm-uitests.yml
+  - template: tests/.azure-devops-wasm-tests.yml
     parameters:
       poolName: '$(linuxScaledPool)'
 
 - stage: skia_tests_uwp
   displayName: Tests - Skia UWP
   dependsOn:
-    - Setup
+    - setup
     - convert_tree
 
   jobs:
-  - template: .azure-devops-skia-tests.yml
+  - template: tests/.azure-devops-skia-tests.yml
     parameters:
       vmImage: '$(windows2022HostedVMImage)'
       vmMacImage: '$(macOSVMImage)'
@@ -159,10 +145,10 @@ stages:
 - stage: skia_tests_winui
   displayName: Tests - Skia WinUI
   dependsOn:
-    - Setup
+    - setup
 
   jobs:
-  - template: .azure-devops-skia-tests.yml
+  - template: tests/.azure-devops-skia-tests.yml
     parameters:
       vmImage: '$(windows2022HostedVMImage)'
       vmMacImage: '$(macOSVMImage)'
@@ -174,21 +160,21 @@ stages:
 - stage: macos_tests
   displayName: Tests - macOS
   dependsOn:
-    - Setup
+    - setup
 
   jobs:
-  - template: .azure-devops-macos.yml
+  - template: tests/.azure-devops-macos.yml
     parameters:
       vmImage: '$(macOSVMImage)'
       xCodeRoot: '$(xCodeRoot)'
 
 - stage: android_tests
   displayName: Tests - Android
   dependsOn:
-    - Setup
+    - setup
 
   jobs:
-  - template: .azure-devops-android-tests.yml
+  - template: tests/.azure-devops-android-tests.yml
     parameters:
       vmWindowsImage: '$(windows2019HostedVMImage)'
       vmLinuxImage: '$(linuxVMImage)'
@@ -199,10 +185,10 @@ stages:
 - stage: ios_tests
   displayName: Tests - iOS
   dependsOn:
-    - Setup
+    - setup
 
   jobs:
-  - template: .azure-devops-ios-tests.yml
+  - template: tests/.azure-devops-ios-tests.yml
     parameters:
       vmImage: '$(macOSVMImage)'
       vmImageTest: '$(macOSVMImage_UITests)'
@@ -212,10 +198,10 @@ stages:
 - stage: wasdk_tests
   displayName: Tests - WinAppSDK  
   dependsOn:
-    - Setup
+    - setup
 
   jobs:
-  - template: .azure-devops-wasdk.yml
+  - template: tests/.azure-devops-wasdk.yml
     parameters:
       poolName: '$(windowsScaledPool)'
 
@@ -230,7 +216,7 @@ stages:
     - skia_tests_winui
 
   jobs:
-  - template: .azure-devops-screenshot-compare.yml
+  - template: tests/.azure-devops-screenshot-compare.yml
     parameters:
       poolName: '$(windowsScaledPool)'
 
@@ -242,7 +228,7 @@ stages:
   condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'), not(eq(variables['build.reason'], 'PullRequest')))
   dependsOn: packages_build
   jobs:
-  - template: .azure-devops-publish-nuget-dev.yml
+  - template: publishing/.azure-devops-publish-nuget-dev.yml
     parameters:
       vmImage: '$(windows2022HostedVMImage)'
 
@@ -251,7 +237,7 @@ stages:
   condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), not(eq(variables['build.reason'], 'PullRequest')))
   dependsOn: packages_build
   jobs:
-  - template: .azure-devops-publish-nuget-prod-dev.yml
+  - template: publishing/.azure-devops-publish-nuget-prod-dev.yml
     parameters:
       vmImage: '$(windows2022HostedVMImage)'
 
@@ -260,6 +246,6 @@ stages:
   condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), not(eq(variables['build.reason'], 'PullRequest')))
   dependsOn: Publish_Prod_Dev
   jobs:
-  - template: .azure-devops-publish-nuget-prod.yml
+  - template: publishing/.azure-devops-publish-nuget-prod.yml
     parameters:
       vmImage: '$(windows2022HostedVMImage)'

build/ci/.azure-devops-package-netcoremobile.yml → build/ci/build/.azure-devops-package-netcoremobile.yml

@@ -27,6 +27,9 @@ jobs:
     UNO_UWP_BUILD: ${{ parameters.UNO_UWP_BUILD }}
     XAML_FLAVOR_BUILD: ${{ parameters.XAML_FLAVOR_BUILD }}
 
+    ArchiveName: windows-netcoremobile-bin
+    ArtifactName: NugetPackages-Artifacts-netcoremobile
+
   steps:
   - checkout: self
     clean: true
@@ -82,19 +85,4 @@ jobs:
       createLogFile: false
     displayName: Building WinAppSDK Graphics3DGL package binaries
 
-  - template: templates/copy-package-assets.yml
-
-  - task: ArchiveFiles@2
-    inputs:
-      rootFolderOrFile: $(build.sourcesdirectory)\build-artifacts\bin-$(XAML_FLAVOR_BUILD)
-      includeRootFolder: false
-      archiveType: 'zip'
-      archiveFile: '$(Build.ArtifactStagingDirectory)/windows-netcoremobile-bin-$(XAML_FLAVOR_BUILD).zip'
-
-  - task: PublishBuildArtifacts@1
-    condition: always()
-    retryCountOnTaskFailure: 3
-    inputs:
-      PathtoPublish: $(build.artifactstagingdirectory)
-      ArtifactName: NugetPackages-Artifacts-netcoremobile-$(XAML_FLAVOR_BUILD)
-      ArtifactType: Container
+  - template: templates/copy-and-publish-package-assets.yml

build/ci/.azure-devops-package-reference.yml → build/ci/build/.azure-devops-package-reference.yml

@@ -17,6 +17,9 @@ jobs:
     UNO_UWP_BUILD: ${{ parameters.UNO_UWP_BUILD }}
     XAML_FLAVOR_BUILD: ${{ parameters.XAML_FLAVOR_BUILD }}
 
+    ArchiveName: Reference-bin
+    ArtifactName: NugetPackages-Artifacts-reference
+
   steps:
   - checkout: self
     clean: true
@@ -43,19 +46,4 @@ jobs:
       dotnet build build/Uno.UI.Build.csproj /m /t:BuildCIReference "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)/build-Reference-$(XAML_FLAVOR_BUILD).binlog
     displayName: Building Reference Binaries
 
-  - template: templates/copy-package-assets.yml
-
-  - task: ArchiveFiles@2
-    inputs:
-      rootFolderOrFile: $(build.sourcesdirectory)/build-artifacts/bin-$(XAML_FLAVOR_BUILD)
-      includeRootFolder: false
-      archiveType: 'zip'
-      archiveFile: '$(Build.ArtifactStagingDirectory)/Reference-bin-$(XAML_FLAVOR_BUILD).zip'
-
-  - task: PublishBuildArtifacts@1
-    condition: always()
-    retryCountOnTaskFailure: 3
-    inputs:
-      PathtoPublish: $(build.artifactstagingdirectory)
-      ArtifactName: NugetPackages-Artifacts-reference-$(XAML_FLAVOR_BUILD)
-      ArtifactType: Container
+  - template: templates/copy-and-publish-package-assets.yml

build/ci/.azure-devops-package-skia.yml → build/ci/build/.azure-devops-package-skia.yml

@@ -28,6 +28,9 @@ jobs:
     UNO_UWP_BUILD: ${{ parameters.UNO_UWP_BUILD }}
     XAML_FLAVOR_BUILD: ${{ parameters.XAML_FLAVOR_BUILD }}
 
+    ArchiveName: skia-bin
+    ArtifactName: NugetPackages-Artifacts-skia
+
   steps:
   - checkout: self
     clean: true
@@ -62,7 +65,7 @@ jobs:
       dotnet build build/Uno.UI.Build.csproj /m /t:BuildCISkia "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)/build-skia-$(XAML_FLAVOR_BUILD).binlog
     displayName: Building Skia Binaries
 
-  - template: templates/copy-package-assets.yml
+  - template: templates/copy-and-publish-package-assets.yml
 
   - task: ArchiveFiles@2
     inputs:

build/ci/.azure-devops-package-wasm.yml → build/ci/build/.azure-devops-package-wasm.yml

@@ -18,6 +18,9 @@ jobs:
     UNO_UWP_BUILD: ${{ parameters.UNO_UWP_BUILD }}
     XAML_FLAVOR_BUILD: ${{ parameters.XAML_FLAVOR_BUILD }}
 
+    ArchiveName: wasm-bin
+    ArtifactName: NugetPackages-Artifacts-wasm
+
   steps:
   - checkout: self
     clean: true
@@ -44,19 +47,4 @@ jobs:
       dotnet build build/Uno.UI.Build.csproj /m /t:BuildCIWasm "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)/build-wasm-$(XAML_FLAVOR_BUILD).binlog
     displayName: Building Wasm Binaries
 
-  - template: templates/copy-package-assets.yml
-
-  - task: ArchiveFiles@2
-    inputs:
-      rootFolderOrFile: $(build.sourcesdirectory)/build-artifacts/bin-$(XAML_FLAVOR_BUILD)
-      includeRootFolder: false
-      archiveType: 'zip'
-      archiveFile: '$(Build.ArtifactStagingDirectory)/wasm-bin-$(XAML_FLAVOR_BUILD).zip'
-
-  - task: PublishBuildArtifacts@1
-    condition: always()
-    retryCountOnTaskFailure: 3
-    inputs:
-      PathtoPublish: $(build.artifactstagingdirectory)
-      ArtifactName: NugetPackages-Artifacts-wasm-$(XAML_FLAVOR_BUILD)
-      ArtifactType: Container
+  - template: templates/copy-and-publish-package-assets.yml