chore(macOS): publish desktop instead of maccatalyst app bundle

Uno.Gallery/Uno.Gallery.csproj

@@ -8,7 +8,6 @@
 		<TargetFramework Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFramework>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">
 			net9.0-ios;
-			net9.0-maccatalyst;
 			net9.0-windows10.0.19041;
 			net9.0-desktop;
 			net9.0-browserwasm;
@@ -35,8 +34,8 @@
 		<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-ios' AND '$(UseNativeRendering)' != 'true' ">com.nventive.uno.gallery</ApplicationId>
 		<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-ios' AND '$(UseNativeRendering)' == 'true' ">uno.platform.gallery.native</ApplicationId>
 
-		<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-maccatalyst' AND '$(UseNativeRendering)' != 'true' ">com.nventive.uno.gallery</ApplicationId>
-		<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-maccatalyst' AND '$(UseNativeRendering)' == 'true' ">uno.platform.gallery.native</ApplicationId>
+		<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-desktop' AND '$(UseNativeRendering)' != 'true' ">com.nventive.uno.gallery</ApplicationId>
+		<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-desktop' AND '$(UseNativeRendering)' == 'true' ">uno.platform.gallery.native</ApplicationId>
 
 		<!-- Versions -->
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
@@ -61,7 +60,7 @@
 		<IsSkiaWasm Condition="'$(IsSkiaWasm)'==''">false</IsSkiaWasm>
 		<IsSkiaAndroid Condition="'$(UseNativeRendering)'!='true' AND '$(TargetFramework)'=='net9.0-android'">true</IsSkiaAndroid>
 		<IsSkiaAndroid Condition="'$(IsSkiaAndroid)'==''">false</IsSkiaAndroid>
-		<IsSkiaUIKit Condition="'$(UseNativeRendering)'!='true' AND ('$(TargetFramework)'=='net9.0-ios' OR '$(TargetFramework)'=='net9.0-maccatalyst')">true</IsSkiaUIKit>
+		<IsSkiaUIKit Condition="'$(UseNativeRendering)'!='true' AND '$(TargetFramework)'=='net9.0-ios'">true</IsSkiaUIKit>
 		<IsSkiaUIKit Condition="'$(IsSkiaUIKit)'==''">false</IsSkiaUIKit>
 		<UnoFeatures>
 			Material;
@@ -158,7 +157,7 @@
 		<CreatePackage>true</CreatePackage>
 		<EnablePackageSigning>true</EnablePackageSigning>
 		<EnableCodeSigning>true</EnableCodeSigning>
-		<CodeSignEntitlements>MacCatalyst\Entitlements.plist</CodeSignEntitlements>
+		<UnoMacOSEntitlements>MacCatalyst\Entitlements.plist</UnoMacOSEntitlements>
 
 		<CodesignProvision>Uno Gallery Native (Catalyst)</CodesignProvision>
 		<CodesignProvision Condition="$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/canaries'))">Uno Gallery Native Canary (Catalyst)</CodesignProvision>

azure-pipelines.yml

@@ -136,23 +136,16 @@ stages:
           BuildCommand: publish
           UseNativeRendering: true
           VariantName: Native
-        Catalyst:
-          BuildTargetFramework: net9.0-maccatalyst
-          ArtifactName: Catalyst
-          ApplicationBuildNumberOffset: 50
-          BuildCommand: build
-          UseNativeRendering: true
-          VariantName: Native
         iOS_Skia:
           BuildTargetFramework: net9.0-ios
           ArtifactName: iOS-mobile
           ApplicationBuildNumberOffset: 50
           BuildCommand: publish
           UseNativeRendering: false
           VariantName: Skia
-        Catalyst_Skia:
-          BuildTargetFramework: net9.0-maccatalyst
-          ArtifactName: Catalyst
+        macOS_Skia:
+          BuildTargetFramework: net9.0-desktop
+          ArtifactName: desktop
           ApplicationBuildNumberOffset: 50
           BuildCommand: build
           UseNativeRendering: false
@@ -245,6 +238,7 @@ stages:
         xCodeRoot: $(XCODE_ROOT)
 
     - template: build/stage-build-mobile.yml
+    - template: build/stage-build-skia-desktop-mac.yml
 
 - stage: WebAssembly
   displayName: 'WebAssembly'
@@ -293,11 +287,11 @@ stages:
 - ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/dev') }}:
   - template: build/templates/canary-publish/stage-publish-wasm-canary.yml
   - template: build/templates/canary-publish/stage-publish-ios-canary.yml
-  - template: build/templates/canary-publish/stage-publish-catalyst-canary.yml
+  - template: build/templates/canary-publish/stage-publish-macos-canary.yml
   - template: build/templates/canary-publish/stage-publish-android-canary.yml
 
 - ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/master') }}:
   - template: build/templates/master-publish/stage-publish-wasm.yml
   - template: build/templates/master-publish/stage-publish-ios.yml
-  - template: build/templates/master-publish/stage-publish-catalyst.yml
+  - template: build/templates/master-publish/stage-publish-macos.yml
   - template: build/templates/master-publish/stage-publish-android.yml

build/build.csproj

@@ -58,7 +58,7 @@
 			<_SourceBasePath>$(MSBuildThisFileDirectory)../$(AppName)</_SourceBasePath>
 			<_AppxManifestPath>$(_SourceBasePath)/Package.appxmanifest</_AppxManifestPath>
 			<_MobileAndroidManifestPath>$(_SourceBasePath)/Platforms/Android/AndroidManifest.xml</_MobileAndroidManifestPath>
-			<_catalystPlistFilePath>$(_SourceBasePath)/Platforms/MacCatalyst/Info.plist</_catalystPlistFilePath>
+			<UnoMacOSCustomInfoPlist>$(_SourceBasePath)/Platforms/MacCatalyst/Info.plist</UnoMacOSCustomInfoPlist>
 			<_MobileiOSPlistFilePath>$(_SourceBasePath)/Platforms/iOS/Info.plist</_MobileiOSPlistFilePath>
 
 			<_AndroidNamespace>
@@ -85,20 +85,20 @@
             Value="$(_VersionCode)"
             Namespaces="$(_AndroidNamespace)" />
 
-		<!-- catalyst -->
-		<!-- Using our own _XmlUpdate instead of XmlPoke to avoid unecessary (and possibly breaking) changes in the plist -->
+		<!-- macOS -->
+		<!-- Using our own _XmlUpdate instead of XmlPoke to avoid unnecessary (and possibly breaking) changes in the plist -->
 		<_XmlUpdate 
-            XmlFileName="$(_catalystPlistFilePath)"
+            XmlFileName="$(UnoMacOSCustomInfoPlist)"
             XPath="//plist/dict/key[text() = 'CFBundleShortVersionString']/following-sibling::string[1]"
             Value="$(_AppVersion)" />
 
 		<_XmlUpdate 
-            XmlFileName="$(_catalystPlistFilePath)"
+            XmlFileName="$(UnoMacOSCustomInfoPlist)"
             XPath="//plist/dict/key[text() = 'CFBundleVersion']/following-sibling::string[1]"
             Value="$(_AppleBuildNumber)" />
 
 		<!-- iOS -->
-		<!-- Using our own _XmlUpdate instead of XmlPoke to avoid unecessary (and possibly breaking) changes in the plist -->
+		<!-- Using our own _XmlUpdate instead of XmlPoke to avoid unnecessary (and possibly breaking) changes in the plist -->
 		<_XmlUpdate 
             XmlFileName="$(_MobileiOSPlistFilePath)"
             XPath="//plist/dict/key[text() = 'CFBundleShortVersionString']/following-sibling::string[1]"

build/stage-build-mobile.yml

@@ -6,7 +6,7 @@ steps:
 
 - template: templates/dotnet-install-mac.yml
   parameters:
-    UnoCheckParameters: '--tfm net9.0-ios --tfm net9.0-maccatalyst'
+    UnoCheckParameters: '--tfm net9.0-ios'
 
 - template: templates/canary-updater.yml
 

build/stage-build-skia-desktop-mac.yml

@@ -0,0 +1,24 @@
+steps:
+- checkout: self
+  clean: true
+  fetchDepth: 0
+  persistCredentials: true
+
+- template: templates/gitversion.yml
+- template: templates/dotnet-install-windows.yml
+- template: templates/canary-updater.yml
+
+- bash: |
+    dotnet publish Uno.Gallery/Uno.Gallery.csproj -p:TargetFrameworkOverride=net9.0-desktop -c Release -p:PackageFormat=pkg -p:InformationalVersion=$(NBGV_InformationalVersion) -bl:$(build.artifactstagingdirectory)/build.binlog
+
+- task: CopyFiles@2
+  displayName: Copy Skia output
+  inputs:
+    SourceFolder: Uno.Gallery/bin/Release/net9.0-desktop
+    Contents: '**/*.pkg'
+    TargetFolder: $(Build.ArtifactStagingDirectory)/bin
+
+- task: PublishBuildArtifacts@1
+  retryCountOnTaskFailure: 3
+  inputs:
+    ArtifactName: desktop

build/templates/canary-publish/stage-publish-macos-canary.yml

@@ -0,0 +1,34 @@
+stages:
+- stage: MacOS_Publish
+  displayName: 'macOS Publish'
+  dependsOn: Apple
+
+  jobs:
+  - deployment: 'MacOS_Publish_Skia'
+    displayName: 'Publish macOS Skia'
+    environment: Uno Gallery
+    pool:
+      vmImage: macos-latest
+
+    strategy:
+      runOnce:
+        deploy:
+          steps:
+          # https://github.com/microsoft/azure-pipelines-tasks/issues/17207
+          - download: none
+          - task: DownloadPipelineArtifact@2
+            inputs:
+              artifactName: 'macOS-skia'
+              targetPath: '$(Pipeline.Workspace)/drop'
+            displayName: Download artifacts
+
+          - task: ms-vsclient.app-store.app-store-release.AppStoreRelease@1
+            displayName: 'Publish to the App Store TestFlight track'
+            inputs:
+              serviceEndpoint: 'App Store (uno platform)'
+              appIdentifier: com.nventive.uno.gallery-canary
+              appType: macOS
+              ipaPath: '$(Pipeline.Workspace)/drop/net9.0-desktop/Uno.Gallery-*.pkg'
+              shouldSkipWaitingForProcessing: true
+              appSpecificId: 6739235480
+

build/templates/canary-updater.yml

@@ -71,5 +71,5 @@ steps:
           $a = $_.fullname; ( get-content $a ) |
           foreach-object { $_ -replace "com.nventive.uno.gallery","com.nventive.uno.gallery-canary" } |
           set-content $a }
-    displayName: 'Adjust info.plist bundle name (Catalyst)'
+    displayName: 'Adjust info.plist bundle name (macOS)'
     condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries')

build/templates/master-publish/stage-publish-macos.yml

@@ -0,0 +1,34 @@
+stages:
+- stage: macOS_Publish
+  displayName: 'macOS Publish'
+  dependsOn: Apple
+
+  jobs:
+  - deployment: 'MacOS_Publish_Skia'
+    displayName: 'Publish macOS Skia'
+    environment: Uno Gallery
+    pool:
+      vmImage: macos-latest
+
+    strategy:
+      runOnce:
+        deploy:
+          steps:
+          # https://github.com/microsoft/azure-pipelines-tasks/issues/17207
+          - download: none
+          - task: DownloadPipelineArtifact@2
+            inputs:
+              artifactName: 'macOS-skia'
+              targetPath: '$(Pipeline.Workspace)/drop'
+            displayName: Download artifacts
+
+          - task: ms-vsclient.app-store.app-store-release.AppStoreRelease@1
+            displayName: 'Publish to the App Store TestFlight track'
+            inputs:
+              serviceEndpoint: 'App Store (uno platform)'
+              appIdentifier: com.nventive.uno.gallery
+              appType: macOS
+              ipaPath: '$(Pipeline.Workspace)/drop/net9.0-desktop/Uno.Gallery-*.pkg'
+              shouldSkipWaitingForProcessing: true
+              appSpecificId: 1619130328
+