chore: Upgrade to .NET 10.0, Uno.Sdk 6.4.42, remove MacCatalyst as deprecated and migrate macOS to Desktop (Skia)

.github/workflows/azure-static-webapp.yml

@@ -14,8 +14,8 @@ on:
 jobs:
   build_and_deploy_job:
     env:
-      DIST_PATH: Uno.Gallery/bin/Release/net9.0-browserwasm/publish/wwwroot
-      DotnetVersion: '9.0.300'
+      DIST_PATH: Uno.Gallery/bin/Release/net10.0-browserwasm/publish/wwwroot
+      DotNetVersion: '10.0.100'
 
     if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
     runs-on: ubuntu-latest
@@ -56,14 +56,14 @@ jobs:
             cache-name: cache-dotnet-install
         with:
             path: ${{ github.workspace }}/.dotnet
-            key: ${{ runner.os }}-build-dotnet-${{ env.DotnetVersion }}
+            key: ${{ runner.os }}-build-dotnet-${{ env.DotNetVersion }}
             restore-keys: |
-              ${{ runner.os }}-build-dotnet-${{ env.DotnetVersion }}
+              ${{ runner.os }}-build-dotnet-${{ env.DotNetVersion }}
 
       - name: Setup .NET
         uses: actions/[email protected]
         with:
-          dotnet-version: ${{ env.DotnetVersion }}
+          dotnet-version: ${{ env.DotNetVersion }}
           include-prerelease: true
 
       - run: |
@@ -79,7 +79,7 @@ jobs:
 
       - run: |
           cd Uno.Gallery
-          dotnet publish -c Release -f net9.0-browserwasm "/p:PackageVersion=${{ steps.nbgv.outputs.SemVer2 }}" /bl:../binlogs/output.binlog
+          dotnet publish -c Release -f net10.0-browserwasm "/p:PackageVersion=${{ steps.nbgv.outputs.SemVer2 }}" /bl:../binlogs/output.binlog
         name: Build Gallery
 
       - uses: actions/upload-artifact@v4

.run/Readme.md

@@ -0,0 +1,3 @@
+# About the `.run` folder
+
+This folder is present to add support for the [Rider IDE](https://aka.platform.uno/rider-getstarted). You can remove this folder safely if you're not using Rider.

.run/Uno.Gallery (WebAssembly IIS Express).run.xml

@@ -0,0 +1,19 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Uno.Gallery (WebAssembly IIS Express)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/Uno.Gallery/Uno.Gallery.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net10.0-browserwasm" />
+    <option name="LAUNCH_PROFILE_NAME" value="Gallery (WebAssembly IIS Express)" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <browser name="98ca6316-2f89-46d9-a9e5-fa9e2b0625b3" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>

.run/Uno.Gallery (WebAssembly).run.xml

@@ -0,0 +1,19 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Uno.Gallery (WebAssembly)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/Uno.Gallery/Uno.Gallery.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net10.0-browserwasm" />
+    <option name="LAUNCH_PROFILE_NAME" value="Gallery (WebAssembly)" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <browser name="98ca6316-2f89-46d9-a9e5-fa9e2b0625b3" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>

.run/Uno.Gallery.run.xml

@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Uno.Gallery (Desktop)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/Uno.Gallery/Uno.Gallery.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net10.0-desktop" />
+    <option name="LAUNCH_PROFILE_NAME" value="Gallery (Desktop)" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "unoplatform.vscode"
+  ],
+}

.vscode/launch.json

@@ -0,0 +1,77 @@
+{
+  // Use IntelliSense to find out which attributes exist for C# debugging
+  // Use hover for the description of the existing attributes
+  // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Uno Platform Mobile Debug",
+      "type": "Uno",
+      "request": "launch",
+      // any Uno* task will do, this is simply to satisfy vscode requirement when a launch.json is present
+      "preLaunchTask": "Uno: android | Debug | android-x64"
+    },
+    {
+      // Use IntelliSense to find out which attributes exist for C# debugging
+      // Use hover for the description of the existing attributes
+      // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+      "name": "Uno Platform WebAssembly Debug (Chrome)",
+      "type": "chrome",
+      "request": "launch",
+      "url": "http://localhost:5000",
+      "webRoot": "${workspaceFolder}/Uno.Gallery",
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "timeout": 30000,
+      "preLaunchTask": "build-wasm",
+      "server": {
+        "runtimeExecutable": "dotnet",
+        "program": "run",
+        "args": ["--no-build","-f","net10.0-browserwasm","--launch-profile", "Gallery (WebAssembly)"],
+        "outputCapture": "std",
+        "timeout": 30000,
+        "cwd": "${workspaceFolder}/Uno.Gallery"
+      }
+    },
+    {
+      // Use IntelliSense to find out which attributes exist for C# debugging
+      // Use hover for the description of the existing attributes
+      // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+      "name": "Uno Platform WebAssembly Debug (Edge)",
+      "type": "msedge",
+      "request": "launch",
+      "url": "http://localhost:5000",
+      "webRoot": "${workspaceFolder}/Uno.Gallery",
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "timeout": 30000,
+      "preLaunchTask": "build-wasm",
+      "server": {
+        "runtimeExecutable": "dotnet",
+        "program": "run",
+        "args": ["--no-build","-f","net10.0-browserwasm","--launch-profile", "Gallery (WebAssembly)"],
+        "outputCapture": "std",
+        "timeout": 30000,
+        "cwd": "${workspaceFolder}/Uno.Gallery"
+      }
+    },
+    {
+      // Use IntelliSense to find out which attributes exist for C# debugging
+      // Use hover for the description of the existing attributes
+      // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+      "name": "Uno Platform Desktop Debug",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build-desktop",
+      // If you have changed target frameworks, make sure to update the program path.
+      "program": "${workspaceFolder}/Uno.Gallery/bin/Debug/net10.0-desktop/Uno.Gallery.dll",
+      "args": [],
+      "launchSettingsProfile": "Gallery (Desktop)",
+      "env": {
+        "DOTNET_MODIFIABLE_ASSEMBLIES": "debug"
+      },
+      "cwd": "${workspaceFolder}/Uno.Gallery",
+      // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+      "console": "internalConsole",
+      "stopAtEntry": false
+    },
+  ]
+}

.vscode/settings.json

@@ -1,3 +1,10 @@
 {
-	"dotnet.defaultSolution": "Uno.Gallery.sln"
-}
+  "explorer.fileNesting.enabled": true,
+  "explorer.fileNesting.expand": false,
+  "explorer.fileNesting.patterns": {
+    "*.xaml": "$(capture).xaml.cs"
+  },
+  "files.associations": {
+    "global.json": "jsonc"
+  }
+}

.vscode/tasks.json

@@ -0,0 +1,57 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "build-wasm",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "build",
+        "${workspaceFolder}/Uno.Gallery/Uno.Gallery.csproj",
+        "/property:GenerateFullPaths=true",
+        "/property:TargetFramework=net10.0-browserwasm",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "publish-wasm",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "publish",
+        "${workspaceFolder}/Uno.Gallery/Uno.Gallery.csproj",
+        "/property:GenerateFullPaths=true",
+        "/property:TargetFramework=net10.0-browserwasm",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "build-desktop",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "build",
+        "${workspaceFolder}/Uno.Gallery/Uno.Gallery.csproj",
+        "/property:GenerateFullPaths=true",
+        "/property:TargetFramework=net10.0-desktop",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "publish-desktop",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "publish",
+        "${workspaceFolder}/Uno.Gallery/Uno.Gallery.csproj",
+        "/property:GenerateFullPaths=true",
+        "/property:TargetFramework=net10.0-desktop",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    }
+  ]
+}

Directory.Build.props

@@ -11,6 +11,12 @@
       PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk)
     -->
 		<NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
+
+		<!--
+      .NET 10 SDK defaults to runtime pack version 10.0.0, but dotnet10-transport feed
+      only contains servicing builds (10.0.1-servicing.*). 
+      Runtime pack version override is now in before.Uno.Gallery.sln.targets for early evaluation.
+    -->
 	</PropertyGroup>
 
 </Project>

Uno.Gallery.UITests/Uno.Gallery.UITests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<IsTestProject>true</IsTestProject>
 	</PropertyGroup>
 	<ItemGroup>

Uno.Gallery/App.xaml.cs

@@ -85,14 +85,14 @@ private void OnLaunchedOrActivated()
 
 			if (isFirstLaunch)
 			{
-#if __IOS__ && USE_UITESTS && !__MACCATALYST__ && !DEBUG
+#if __IOS__ && USE_UITESTS && !DEBUG
 				// requires Xamarin Test Cloud Agent
 				Xamarin.Calabash.Start();
 #endif
 
 				InitializeWindow(MainWindow);
 			}
-
+			
 			// Ensure the current window is active
 			MainWindow.Activate();
 		}

Uno.Gallery/Directory.Build.props

@@ -0,0 +1,12 @@
+<Project>
+  <!-- Import the root Directory.Build.props to preserve CPM and other settings -->
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+  <PropertyGroup>
+    <!-- .NET 10 SDK defaults to runtime pack version 10.0.0, but dotnet10-transport feed
+         only contains servicing builds. The MicrosoftNETCoreAppRuntimeVersion property
+         is set in the root Directory.Build.props and should apply to all frameworks. -->
+    <SelfContained>true</SelfContained>
+    <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
+  </PropertyGroup>
+</Project>

Uno.Gallery/Platforms/MacCatalyst/Entitlements.plist → Uno.Gallery/Platforms/Desktop/Entitlements.plist

@@ -2,10 +2,15 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 	<dict>
+		<!-- App Sandbox (required for Mac App Store distribution) -->
 		<key>com.apple.security.app-sandbox</key>
 		<true/>
+
+		<!-- Network access (for web content, APIs, etc.) -->
 		<key>com.apple.security.network.client</key>
 		<true/>
+
+		<!-- Disable library validation (allows loading of unsigned dylibs from Uno/Skia) -->
 		<key>com.apple.security.cs.disable-library-validation</key>
 		<true/>
 	</dict>

Uno.Gallery/Platforms/MacCatalyst/Info.plist → Uno.Gallery/Platforms/Desktop/Info.plist

@@ -12,22 +12,10 @@
 		<string>1.0</string>
 		<key>CFBundleVersion</key>
 		<string>1.0</string>
-		<key>UIDeviceFamily</key>
-		<array>
-			<integer>2</integer>
-		</array>
-		<key>UILaunchStoryboardName</key>
-		<string>LaunchScreen</string>
 		<key>NSLocationWhenInUseUsageDescription</key>
 		<string>This app requires location for the Geolocator sample to work. The data is not shared.</string>
 		<key>NSMotionUsageDescription</key>
 		<string>This app requires motion tracking for the Pedometer sample to work.</string>
-		<key>UISupportedInterfaceOrientations</key>
-		<array>
-			<string>UIInterfaceOrientationPortrait</string>
-			<string>UIInterfaceOrientationLandscapeLeft</string>
-			<string>UIInterfaceOrientationLandscapeRight</string>
-		</array>
 		<key>XSAppIconAssets</key>
 		<string>Assets.xcassets/icon.appiconset</string>
 		<key>UIAppFonts</key>
@@ -38,5 +26,7 @@
 		<false/>
 		<key>LSApplicationCategoryType</key>
 		<string>public.app-category.utilities</string>
+		<key>LSMinimumSystemVersion</key>
+		<string>15.0</string>
 	</dict>
 </plist>