From 94358bb3d6625bd2a172276f09fdf5c97809575e Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Sat, 22 Feb 2025 00:32:42 +0100 Subject: [PATCH 1/6] chore(TargetPlatformHelper): Reordered cases and grouped equal --- UnoCheck/TargetPlatformHelper.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/UnoCheck/TargetPlatformHelper.cs b/UnoCheck/TargetPlatformHelper.cs index e026c54b..fbf59bc5 100644 --- a/UnoCheck/TargetPlatformHelper.cs +++ b/UnoCheck/TargetPlatformHelper.cs @@ -24,11 +24,16 @@ public static TargetPlatform GetTargetPlatformsFromFlags(string[]? targetPlatfor return output; } - + /// + /// Converts the string provided uno-check input argument to the corresponding + /// + /// The user-provided argument as + /// The from the public static TargetPlatform GetTargetPlatformFromFlag(string flag) { switch (flag.ToLowerInvariant()) { + case "web": case "webassembly": case "wasm": return TargetPlatform.WebAssembly; @@ -39,24 +44,19 @@ public static TargetPlatform GetTargetPlatformFromFlag(string flag) return TargetPlatform.Android; case "macos": return TargetPlatform.macOS; - case "skiadesktop": - return TargetPlatform.SkiaDesktop; case "windows": case "wasdk": return TargetPlatform.WinAppSDK; case "win32desktop": case "win32": return TargetPlatform.Windows; + case "skiadesktop": case "skia": return TargetPlatform.SkiaDesktop; case "linux": return TargetPlatform.SkiaDesktop; - case "web": - return TargetPlatform.WebAssembly; - case "all": return TargetPlatform.All; - default: return TargetPlatform.None; } From 4ee59df590bdcee1fb01a7884f548e99e63bcdf4 Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Sat, 22 Feb 2025 14:57:32 +0100 Subject: [PATCH 2/6] docs(configuring-uno-check): Updated setup commands versions to the current version of uno-check --- doc/configuring-uno-check.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/configuring-uno-check.md b/doc/configuring-uno-check.md index f70d8082..d9326376 100644 --- a/doc/configuring-uno-check.md +++ b/doc/configuring-uno-check.md @@ -11,22 +11,21 @@ It is possible to run Uno.Check to setup your build environment in a repeatable # [**Windows**](#tab/windows) ```bash -dotnet tool install --global Uno.Check --version 1.20.0 +dotnet tool install --global Uno.Check --version 1.29.4 uno-check -v --ci --non-interactive --fix --skip vswin --skip androidemulator --skip androidsdk ``` # [**macOS**](#tab/macos) ```bash -dotnet tool install --global Uno.Check --version 1.20.0 +dotnet tool install --global Uno.Check --version 1.29.4 uno-check -v --ci --non-interactive --fix --skip xcode --skip androidemulator --skip androidsdk ``` - # [**Linux**](#tab/linux) ```bash -dotnet tool install --global Uno.Check --version 1.20.0 +dotnet tool install --global Uno.Check --version 1.29.4 uno-check -v --ci --non-interactive --fix --skip androidemulator ``` From a6ee049c41a745b84988ae1c8faf33f809a9db4a Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Sat, 22 Feb 2025 14:59:02 +0100 Subject: [PATCH 3/6] chore(configuring-uno-check): Markdown formatting corrected for tabs to have the correct level --- doc/configuring-uno-check.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/configuring-uno-check.md b/doc/configuring-uno-check.md index d9326376..b9eef575 100644 --- a/doc/configuring-uno-check.md +++ b/doc/configuring-uno-check.md @@ -8,21 +8,21 @@ uid: UnoCheck.Configuration It is possible to run Uno.Check to setup your build environment in a repeatable way by using the following commands: -# [**Windows**](#tab/windows) +## [**Windows**](#tab/windows) ```bash dotnet tool install --global Uno.Check --version 1.29.4 uno-check -v --ci --non-interactive --fix --skip vswin --skip androidemulator --skip androidsdk ``` -# [**macOS**](#tab/macos) +## [**macOS**](#tab/macos) ```bash dotnet tool install --global Uno.Check --version 1.29.4 uno-check -v --ci --non-interactive --fix --skip xcode --skip androidemulator --skip androidsdk ``` -# [**Linux**](#tab/linux) +## [**Linux**](#tab/linux) ```bash dotnet tool install --global Uno.Check --version 1.29.4 From 3ad12bdeb1b4cff5c184f7ba2eb7137e3d14f88e Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Sat, 22 Feb 2025 15:18:11 +0100 Subject: [PATCH 4/6] docs(configuring-uno-check): Added note to the requirement of using target prefix before each target platform value --- doc/configuring-uno-check.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/configuring-uno-check.md b/doc/configuring-uno-check.md index b9eef575..961baba9 100644 --- a/doc/configuring-uno-check.md +++ b/doc/configuring-uno-check.md @@ -60,6 +60,10 @@ So, for example, the following will only check your environment for web and Linu uno-check --target wasm --target linux ``` +> [!Note:] +> When specifying multiple target platforms, each element must be preceded by --target. +> It is not possible to list multiple values without this prefix. + The following argument values for `--target` are supported: | Value | Comments | From 035ed293b6209d9c5851b9917b7db0ab2d4498fd Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Sat, 22 Feb 2025 15:40:38 +0100 Subject: [PATCH 5/6] docs(configuring-uno-check): Updated target platform table --- doc/configuring-uno-check.md | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/doc/configuring-uno-check.md b/doc/configuring-uno-check.md index 961baba9..d7453553 100644 --- a/doc/configuring-uno-check.md +++ b/doc/configuring-uno-check.md @@ -64,19 +64,18 @@ uno-check --target wasm --target linux > When specifying multiple target platforms, each element must be preceded by --target. > It is not possible to list multiple values without this prefix. -The following argument values for `--target` are supported: - -| Value | Comments | -|-----------|-------------------| -| wasm | | -| ios | | -| android | | -| macos | | -| linux | | -| skiawpf | | -| uwp | | -| win32 | | -| all | All platforms | +Supported target platforms and their `--target` values: + +| Target Platform | Input Values | +|------------------|------------------------------------| +| WebAssembly | `web`, `webassembly`, `wasm` | +| iOS | `ios` | +| Android | `android`, `droid` | +| macOS | `macos` | +| SkiaDesktop | `skiadesktop`, `skia`, `linux` | +| WinAppSDK | `winappsdk`, `wasdk` | +| Windows | `windows`, `win32desktop`, `win32` | +| All Platforms | `all` | ### `-m `, `--manifest ` Manifest File or Url From ed2454bd3ffa0a935e11ded022ec215d1d640489 Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Sat, 22 Feb 2025 23:00:15 +0100 Subject: [PATCH 6/6] fix(TargetPlatformHelper): Moved windows case to logical result in the windows target platform instead of the WinAppSDK --- UnoCheck/TargetPlatformHelper.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/UnoCheck/TargetPlatformHelper.cs b/UnoCheck/TargetPlatformHelper.cs index fbf59bc5..ab63bd6b 100644 --- a/UnoCheck/TargetPlatformHelper.cs +++ b/UnoCheck/TargetPlatformHelper.cs @@ -44,9 +44,10 @@ public static TargetPlatform GetTargetPlatformFromFlag(string flag) return TargetPlatform.Android; case "macos": return TargetPlatform.macOS; - case "windows": + case "winappsdk": case "wasdk": return TargetPlatform.WinAppSDK; + case "windows": case "win32desktop": case "win32": return TargetPlatform.Windows;