ci: Adjust canary updater

build/stage-build-android-mobile.yml

@@ -1,6 +1,6 @@
 steps:
-- template: templates/canary-updater.yml
 - template: templates/dotnet-install-windows.yml
+- template: templates/canary-updater.yml
 
 - task: DownloadSecureFile@1
   name: keyStore

build/stage-build-android-xamarin.yml

@@ -1,5 +1,4 @@
 steps:
-- template: templates/canary-updater.yml
 
 - task: DownloadSecureFile@1
   name: keyStore
@@ -15,6 +14,7 @@ steps:
     version: 3.1.3
 
 - template: templates/gitversion.yml
+- template: templates/canary-updater.yml
 
 - task: MSBuild@1
   displayName: Build project

build/stage-build-ios-xamarin.yml

@@ -1,5 +1,4 @@
 steps:
-- template: templates/canary-updater.yml
 
 - task: UseDotNet@2
   condition: eq(variables['IsCanaryBranch'], true)
@@ -9,6 +8,7 @@ steps:
     version: 3.1.3
 
 - template: templates/gitversion.yml
+- template: templates/canary-updater.yml
 
 - task: MSBuild@1
   displayName: Build project

build/stage-build-macos-xamarin.yml

@@ -1,5 +1,4 @@
 steps:
-- template: templates/canary-updater.yml
 
 - task: UseDotNet@2
   condition: eq(variables['IsCanaryBranch'], true)
@@ -9,6 +8,7 @@ steps:
     version: 3.1.3
 
 - template: templates/gitversion.yml
+- template: templates/canary-updater.yml
 
 - task: MSBuild@1
   displayName: Build project

build/stage-build-mobile.yml

@@ -1,7 +1,7 @@
 steps:
-- template: templates/canary-updater.yml
 - template: templates/dotnet-install-mac.yml
 - template: templates/dotnet-install-windows.yml
+- template: templates/canary-updater.yml
 
 - task: DownloadSecureFile@1
   name: keyStore

build/stage-build-skia-gtk.yml

@@ -1,5 +1,4 @@
 steps:
-- template: templates/canary-updater.yml
 
 - task: UseDotNet@2
   condition: eq(variables['IsCanaryBranch'], true)
@@ -9,6 +8,7 @@ steps:
     version: 3.1.3
 
 - template: templates/gitversion.yml
+- template: templates/canary-updater.yml
 
 - task: MSBuild@1
   displayName: Build project

build/stage-build-uwp.yml

@@ -1,5 +1,4 @@
 steps:
-- template: templates/canary-updater.yml
 
 - task: UseDotNet@2
   condition: eq(variables['IsCanaryBranch'], true)
@@ -9,6 +8,7 @@ steps:
     version: 3.1.3
 
 - template: templates/gitversion.yml
+- template: templates/canary-updater.yml
 
 - task: MSBuild@1
   displayName: Build project

build/stage-build-wasm.yml

@@ -5,7 +5,6 @@
     packageType: runtime
     version: 2.2.x
 
-- template: templates/canary-updater.yml
 - template: templates/gitversion.yml
 
 - task: UseDotNet@2
@@ -13,6 +12,8 @@
   inputs:
     packageType: sdk
     version: 6.0.200
+    
+- template: templates/canary-updater.yml
 
 - bash: |
     dotnet msbuild /ds /m /r /p:Configuration=Release "/p:InformationalVersion=%GITVERSION_InformationalVersion%" Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj /bl:$(Build.ArtifactStagingDirectory)/wasm.binlog

build/stage-uitests-android.yml

@@ -14,11 +14,11 @@
   - checkout: self
     clean: true
 
-  - template: templates/canary-updater.yml
-
   - bash: /bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(XamarinSDKVersion)"
     displayName: Select Xamarin Version
 
+  - template: templates/canary-updater.yml
+
   - bash: |
       chmod +x $(build.sourcesdirectory)/build/scripts/android-uitest-run.sh
       $(build.sourcesdirectory)/build/scripts/android-uitest-run.sh

build/stage-uitests-ios.yml

@@ -14,14 +14,14 @@
   - checkout: self
     clean: true
 
-  - template: templates/canary-updater.yml
-
   - bash: /bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(XamarinSDKVersion)"
     displayName: Select Xamarin Version
     
   - bash: /bin/bash -c "echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'${XCODE_ROOT};sudo xcode-select --switch ${XCODE_ROOT}/Contents/Developer"
     displayName: Select Xcode
     
+  - template: templates/canary-updater.yml
+
   - bash: |
       chmod +x $(build.sourcesdirectory)/build/scripts/ios-uitest-run.sh
       $(build.sourcesdirectory)/build/scripts/ios-uitest-run.sh

build/stage-uitests-wasm.yml

@@ -13,8 +13,6 @@
   - checkout: self
     clean: true
 
-  - template: templates/canary-updater.yml
-
   - task: UseDotNet@2
     displayName: 'Use .Net Core runtime 6.0.x'
     retryCountOnTaskFailure: 3
@@ -22,6 +20,8 @@
       packageType: sdk
       version: 6.0.200
 
+  - template: templates/canary-updater.yml
+
   - bash: |
       chmod +x build/scripts/wasm-uitest-run.sh
       build/scripts/wasm-uitest-run.sh