From c73a7f5f5f7920bd5f42fc58d184ecfcf6706113 Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Sun, 3 Aug 2025 17:22:01 +0200 Subject: [PATCH 1/2] feat(ToDo): Add Desktop Target and clean its Programm.cs from the <6.0 InitializeLogging call Test Build succeeded, limitations in app given through known issues --- .../src/ToDo/Platforms/Desktop/Program.cs | 2 - .../PublishProfiles/win-arm64.pubxml | 44 ++++----- .../Properties/PublishProfiles/win-x64.pubxml | 44 ++++----- .../Properties/PublishProfiles/win-x86.pubxml | 44 ++++----- .../src/ToDo/Properties/launchSettings.json | 90 ++++++++++--------- reference/ToDo/src/ToDo/ToDo.csproj | 2 +- reference/ToDo/src/global.json | 15 ++-- 7 files changed, 124 insertions(+), 117 deletions(-) rename reference/ToDo/src/ToDo/{Platforms/Windows => }/Properties/PublishProfiles/win-arm64.pubxml (97%) rename reference/ToDo/src/ToDo/{Platforms/Windows => }/Properties/PublishProfiles/win-x64.pubxml (97%) rename reference/ToDo/src/ToDo/{Platforms/Windows => }/Properties/PublishProfiles/win-x86.pubxml (97%) diff --git a/reference/ToDo/src/ToDo/Platforms/Desktop/Program.cs b/reference/ToDo/src/ToDo/Platforms/Desktop/Program.cs index 9d5d8e057..649cdd3ba 100644 --- a/reference/ToDo/src/ToDo/Platforms/Desktop/Program.cs +++ b/reference/ToDo/src/ToDo/Platforms/Desktop/Program.cs @@ -7,8 +7,6 @@ public class Program [STAThread] public static void Main(string[] args) { - App.InitializeLogging(); - var host = UnoPlatformHostBuilder.Create() .App(() => new App()) .UseX11() diff --git a/reference/ToDo/src/ToDo/Platforms/Windows/Properties/PublishProfiles/win-arm64.pubxml b/reference/ToDo/src/ToDo/Properties/PublishProfiles/win-arm64.pubxml similarity index 97% rename from reference/ToDo/src/ToDo/Platforms/Windows/Properties/PublishProfiles/win-arm64.pubxml rename to reference/ToDo/src/ToDo/Properties/PublishProfiles/win-arm64.pubxml index d5147f103..3d77d0308 100644 --- a/reference/ToDo/src/ToDo/Platforms/Windows/Properties/PublishProfiles/win-arm64.pubxml +++ b/reference/ToDo/src/ToDo/Properties/PublishProfiles/win-arm64.pubxml @@ -1,22 +1,22 @@ - - - - - FileSystem - arm64 - win-arm64 - bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ - true - False - False - True - - - - + + + + + FileSystem + arm64 + win-arm64 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + False + False + True + + + + diff --git a/reference/ToDo/src/ToDo/Platforms/Windows/Properties/PublishProfiles/win-x64.pubxml b/reference/ToDo/src/ToDo/Properties/PublishProfiles/win-x64.pubxml similarity index 97% rename from reference/ToDo/src/ToDo/Platforms/Windows/Properties/PublishProfiles/win-x64.pubxml rename to reference/ToDo/src/ToDo/Properties/PublishProfiles/win-x64.pubxml index 4fea954ee..6c8abebf6 100644 --- a/reference/ToDo/src/ToDo/Platforms/Windows/Properties/PublishProfiles/win-x64.pubxml +++ b/reference/ToDo/src/ToDo/Properties/PublishProfiles/win-x64.pubxml @@ -1,22 +1,22 @@ - - - - - FileSystem - x64 - win-x64 - bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ - true - False - False - True - - - - + + + + + FileSystem + x64 + win-x64 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + False + False + True + + + + diff --git a/reference/ToDo/src/ToDo/Platforms/Windows/Properties/PublishProfiles/win-x86.pubxml b/reference/ToDo/src/ToDo/Properties/PublishProfiles/win-x86.pubxml similarity index 97% rename from reference/ToDo/src/ToDo/Platforms/Windows/Properties/PublishProfiles/win-x86.pubxml rename to reference/ToDo/src/ToDo/Properties/PublishProfiles/win-x86.pubxml index 928cb25eb..b0010bcb7 100644 --- a/reference/ToDo/src/ToDo/Platforms/Windows/Properties/PublishProfiles/win-x86.pubxml +++ b/reference/ToDo/src/ToDo/Properties/PublishProfiles/win-x86.pubxml @@ -1,22 +1,22 @@ - - - - - FileSystem - x86 - win-x86 - bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ - true - False - False - True - - - - + + + + + FileSystem + x86 + win-x86 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + False + False + True + + + + diff --git a/reference/ToDo/src/ToDo/Properties/launchSettings.json b/reference/ToDo/src/ToDo/Properties/launchSettings.json index bc0096ad6..6eef6e858 100644 --- a/reference/ToDo/src/ToDo/Properties/launchSettings.json +++ b/reference/ToDo/src/ToDo/Properties/launchSettings.json @@ -1,40 +1,50 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:8080", - "sslPort": 0 - } - }, - "profiles": { - // This profile is first in order for dotnet run to pick it up by default - "ToDo (WebAssembly)": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "applicationUrl": "http://localhost:5000", - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "ToDo (WebAssembly IIS Express)": { - "commandName": "IISExpress", - "launchBrowser": true, - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - // Note: In order to select this profile, you'll need to comment the `Packaged` profile below until this is fixed: https://aka.platform.uno/wasdk-maui-debug-profile-issue - "ToDo (WinAppSDK Unpackaged)": { - "commandName": "Project", - "compatibleTargetFramework": "windows" - }, - "ToDo (WinAppSDK Packaged)": { - "commandName": "MsixPackage", - "compatibleTargetFramework": "windows" - } - } -} +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:8080", + "sslPort": 0 + } + }, + "profiles": { + // This profile is first in order for dotnet run to pick it up by default + "ToDo (WebAssembly)": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:5000", + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "ToDo (WebAssembly IIS Express)": { + "commandName": "IISExpress", + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + // Note: In order to select this profile, you'll need to comment the `Packaged` profile below until this is fixed: https://aka.platform.uno/wasdk-maui-debug-profile-issue + "ToDo (WinAppSDK Unpackaged)": { + "commandName": "Project", + "compatibleTargetFramework": "windows" + }, + "ToDo (WinAppSDK Packaged)": { + "commandName": "MsixPackage", + "compatibleTargetFramework": "windows" + }, + "ToDo (Desktop)": { + "commandName": "Project", + "compatibleTargetFramework": "desktop" + }, + "ToDo (Desktop WSL2)": { + "commandName": "WSL2", + "commandLineArgs": "{ProjectDir}/bin/Debug/net9.0-desktop/ToDo.dll", + "distributionName": "", + "compatibleTargetFramework": "desktop" + } + } +} diff --git a/reference/ToDo/src/ToDo/ToDo.csproj b/reference/ToDo/src/ToDo/ToDo.csproj index 94535239f..f65e44d16 100644 --- a/reference/ToDo/src/ToDo/ToDo.csproj +++ b/reference/ToDo/src/ToDo/ToDo.csproj @@ -1,6 +1,6 @@ - net9.0-android;net9.0-ios;net9.0-windows10.0.26100;net9.0-browserwasm + net9.0-desktop;net9.0-android;net9.0-ios;net9.0-windows10.0.26100;net9.0-browserwasm Exe true diff --git a/reference/ToDo/src/global.json b/reference/ToDo/src/global.json index 00cc18b93..0cd352a69 100644 --- a/reference/ToDo/src/global.json +++ b/reference/ToDo/src/global.json @@ -1,9 +1,8 @@ -{ - // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information. - "msbuild-sdks": { - "Uno.Sdk": "6.0.67" - }, - "sdk": { - "allowPrerelease": false - } +{ + "msbuild-sdks": { + "Uno.Sdk": "6.1.23" + }, + "sdk": { + "allowPrerelease": false + } } From 9e20b8315a073808898743f33166e4dfc6a86fc6 Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Sun, 3 Aug 2025 17:37:06 +0200 Subject: [PATCH 2/2] chore: revert deleting how to update advise --- reference/ToDo/src/global.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/reference/ToDo/src/global.json b/reference/ToDo/src/global.json index 0cd352a69..616aeb735 100644 --- a/reference/ToDo/src/global.json +++ b/reference/ToDo/src/global.json @@ -1,8 +1,9 @@ { + // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information. "msbuild-sdks": { "Uno.Sdk": "6.1.23" }, "sdk": { "allowPrerelease": false } -} +}