chore: Restrict uno.check install

unoplatform · Nov 6, 2024 · f033722 · f033722
1 parent e4442a9
commit f033722
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 3 deletions.
diff --git a/build/stage-build-android-mobile.yml b/build/stage-build-android-mobile.yml
@@ -1,5 +1,8 @@
 steps:
 - template: templates/dotnet-install-windows.yml
+  parameters:
+    UnoCheckParameters: '--tfm net9.0-android'
+
 - template: templates/canary-updater.yml
 
 - task: DownloadSecureFile@1

diff --git a/build/stage-build-mobile.yml b/build/stage-build-mobile.yml
@@ -1,6 +1,12 @@
 steps:
 - template: templates/dotnet-install-mac.yml
+  parameters:
+    UnoCheckParameters: '--tfm net9.0-ios --tfm net9.0-maccatalyst'
+
 - template: templates/dotnet-install-windows.yml
+  parameters:
+    UnoCheckParameters: '--tfm net9.0-ios --tfm net9.0-maccatalyst'
+
 - template: templates/canary-updater.yml
 
 - task: DownloadSecureFile@1

diff --git a/build/stage-build-wasm.yml b/build/stage-build-wasm.yml
@@ -8,6 +8,9 @@
 - template: templates/gitversion.yml
 
 - template: templates/dotnet-install-linux.yml
+  parameters:
+    UnoCheckParameters: '--tfm net9.0-browserwasm'
+
 - template: templates/canary-updater.yml
 
 - bash: |

diff --git a/build/stage-uitests-android.yml b/build/stage-uitests-android.yml
@@ -53,6 +53,9 @@
     artifact: Android_UITest
 
   - template: templates/dotnet-install-mac.yml
+    parameters:
+      UnoCheckParameters: '--tfm net9.0-android'
+
   - template: templates/canary-updater.yml
 
   - bash: |

diff --git a/build/stage-uitests-ios.yml b/build/stage-uitests-ios.yml
@@ -13,6 +13,8 @@
     clean: true
 
   - template: templates/dotnet-install-mac.yml
+    parameters:
+      UnoCheckParameters: '--tfm net9.0-ios'
 
   - template: templates/xcode-select.yml
     parameters:

diff --git a/build/stage-uitests-wasm.yml b/build/stage-uitests-wasm.yml
@@ -14,6 +14,9 @@
     clean: true
 
   - template: templates/dotnet-install-linux.yml
+    parameters:
+      UnoCheckParameters: '--tfm net9.0-browserwasm'
+
   - template: templates/canary-updater.yml
 
   - bash: |

diff --git a/build/templates/dotnet-install-linux.yml b/build/templates/dotnet-install-linux.yml
@@ -3,6 +3,7 @@ parameters:
   UnoCheck_Version: '1.26.1'
   installJava: true
   installWorkloads: true
+  UnoCheckParameters: ''
 
 steps:
   - task: UseDotNet@2
@@ -27,6 +28,6 @@ steps:
 
   - bash: |
       dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
-      uno-check --verbose --ci --non-interactive --fix --skip gtk3 --skip androidsdk --pre-major
+      uno-check --verbose --ci --non-interactive --fix --skip gtk3 --skip androidsdk --pre-major ${{ parameters.UnoCheckParameters }}
     displayName: Install .NET Workloads
     condition: and( eq(variables['Agent.OS'], 'Linux'), eq('${{ parameters.installWorkloads }}', 'true') )
diff --git a/build/templates/dotnet-install-mac.yml b/build/templates/dotnet-install-mac.yml
@@ -2,6 +2,7 @@ parameters:
   DotNetVersion: '9.0.100-rc.2.24474.11'
   UnoCheck_Version: '1.26.1'
   installWorkloads: true
+  UnoCheckParameters: ''
 
 steps:
   # Required until .NET 6 installs properly using UseDotnet
@@ -28,6 +29,6 @@ steps:
 
   - bash: |
       dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
-      uno-check --ci --non-interactive --fix --skip gtk3 --skip xcode --skip vswin --skip androidemulator --skip vsmac --pre-major
+      uno-check --ci --non-interactive --fix --skip gtk3 --skip xcode --skip vswin --skip androidemulator --skip vsmac --pre-major ${{ parameters.UnoCheckParameters }}
     displayName: Install .NET Workloads
     condition: and( eq(variables['Agent.OS'], 'Darwin'), eq('${{ parameters.installWorkloads }}', 'true') )
diff --git a/build/templates/dotnet-install-windows.yml b/build/templates/dotnet-install-windows.yml
@@ -1,6 +1,8 @@
 parameters:
   DotNetVersion: '9.0.100-rc.2.24474.11'
   UnoCheck_Version: '1.26.1'
+  UnoCheckParameters: ''
+
 steps:
 
   # Required until .NET 6 installs properly on Windows using UseDotnet
@@ -24,7 +26,7 @@ steps:
 
   - powershell: |
       & dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
-      & uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --pre-major
+      & uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --pre-major ${{ parameters.UnoCheckParameters }}
     displayName: Install .NET Workloads
     errorActionPreference: continue
     ignoreLASTEXITCODE: true