From 50b0aae90fb7d51ace920597366afcaa32173482 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Wed, 6 Nov 2024 15:04:34 -0500 Subject: [PATCH] chore: Force TFM override to avoid having to install unnecessary workloads --- azure-pipelines.yml | 4 ++-- build/stage-build-android-mobile.yml | 4 ++-- build/stage-build-mobile.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dee8a471c..e24e0b917 100644 --- 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 index a613397bb..2bd936751 100644 --- 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 index 954af3203..76b93a3ea 100644 --- 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')