chore: Force TFM override to avoid having to install unnecessary work…

…loads
unoplatform · Nov 6, 2024 · 50b0aae · 50b0aae
1 parent f033722
commit 50b0aae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -111,8 +111,8 @@ stages:
     steps:
     - template: build/stage-build-skia-desktop.yml
 
-- stage: Catalyst
-  displayName: 'Catalyst'
+- stage: Apple
+  displayName: 'Apple'
   dependsOn: []
   jobs:
   - job: macOS_netcore

diff --git a/build/stage-build-android-mobile.yml b/build/stage-build-android-mobile.yml
@@ -15,13 +15,13 @@ steps:
 
 - script: |
     cd $(build.sourcesdirectory)/Uno.Gallery
-    dotnet publish -f:net9.0-android -c:Release "/p:InformationalVersion=$(GitVersion.InformationalVersion)" /p:AndroidSigningKeyStore=$(keyStore.secureFilePath) /p:AndroidSigningStorePass=$(AndroidSigningStorePass) /p:AndroidSigningKeyPass=$(AndroidSigningKeyPass) /p:AndroidSigningKeyAlias=$(AndroidSigningKeyAlias) /p:AndroidKeyStore=true /bl:$(build.artifactstagingdirectory)/build-$(BuildForPlayStore).binlog
+    dotnet publish -f:net9.0-android -p:TargetFrameworkOverride=net9.0-android -c:Release "/p:InformationalVersion=$(GitVersion.InformationalVersion)" /p:AndroidSigningKeyStore=$(keyStore.secureFilePath) /p:AndroidSigningStorePass=$(AndroidSigningStorePass) /p:AndroidSigningKeyPass=$(AndroidSigningKeyPass) /p:AndroidSigningKeyAlias=$(AndroidSigningKeyAlias) /p:AndroidKeyStore=true /bl:$(build.artifactstagingdirectory)/build-$(BuildForPlayStore).binlog
   displayName: 'Build Android Package'
   condition: eq(variables['System.PullRequest.IsFork'],'False')
 
 - script: |
     cd $(build.sourcesdirectory)/Uno.Gallery
-    dotnet publish -f:net9.0-android -c:Release "/p:InformationalVersion=$(GitVersion.InformationalVersion)" /p:AndroidKeyStore=False /bl:$(build.artifactstagingdirectory)/build-$(BuildForPlayStore).binlog
+    dotnet publish -f:net9.0-android -p:TargetFrameworkOverride=net9.0-android -c:Release "/p:InformationalVersion=$(GitVersion.InformationalVersion)" /p:AndroidKeyStore=False /bl:$(build.artifactstagingdirectory)/build-$(BuildForPlayStore).binlog
   displayName: 'Build Android Package (Fork)'
   condition: eq(variables['System.PullRequest.IsFork'],'True')
 

diff --git a/build/stage-build-mobile.yml b/build/stage-build-mobile.yml
@@ -27,14 +27,14 @@ steps:
 - bash: |
     cd $(build.sourcesdirectory)/Uno.Gallery
     echo "BUILD_SOURCEBRANCH: $BUILD_SOURCEBRANCH"
-    dotnet $(BuildCommand) -v:n -f $(BuildTargetFramework) -c Release /p:ArchiveOnBuild=true /bl:$(build.artifactstagingdirectory)/build-$(BuildTargetFramework).binlog "/p:InformationalVersion=$(GitVersion.InformationalVersion)"
+    dotnet $(BuildCommand) -v:n -f $(BuildTargetFramework) -p:TargetFrameworkOverride=$(BuildTargetFramework) -c Release /p:ArchiveOnBuild=true /bl:$(build.artifactstagingdirectory)/build-$(BuildTargetFramework).binlog "/p:InformationalVersion=$(GitVersion.InformationalVersion)"
   displayName: Build project for Release - $(BuildTargetFramework)
   condition: eq(variables['System.PullRequest.IsFork'],'False')
 
 - bash: |
     cd $(build.sourcesdirectory)/Uno.Gallery
     echo "BUILD_SOURCEBRANCH: $BUILD_SOURCEBRANCH"
-    dotnet build -f $(BuildTargetFramework) -c Release /bl:$(build.artifactstagingdirectory)/build-$(BuildTargetFramework).binlog "/p:InformationalVersion=$(GitVersion.InformationalVersion)"
+    dotnet build -f $(BuildTargetFramework) -p:TargetFrameworkOverride=$(BuildTargetFramework) -c Release /bl:$(build.artifactstagingdirectory)/build-$(BuildTargetFramework).binlog "/p:InformationalVersion=$(GitVersion.InformationalVersion)"
   displayName: Build project for Release - $(BuildTargetFramework)
   condition: eq(variables['System.PullRequest.IsFork'],'True')