From e5ee096436dcb89dce44cf5a1220d4784e03af14 Mon Sep 17 00:00:00 2001 From: Daniil Pavliuchyk Date: Tue, 4 Feb 2025 22:59:00 +0200 Subject: [PATCH 1/2] fix: Update skips logic --- UnoCheck/CheckCommand.cs | 20 +++++++++++++------- UnoCheck/Util.cs | 13 +++++++++++-- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/UnoCheck/CheckCommand.cs b/UnoCheck/CheckCommand.cs index d3003ce..e432d89 100644 --- a/UnoCheck/CheckCommand.cs +++ b/UnoCheck/CheckCommand.cs @@ -92,7 +92,8 @@ public override async Task ExecuteAsync(CommandContext context, CheckSettin AnsiConsole.MarkupLine(" ok"); AnsiConsole.Markup($"[bold blue]{Icon.Thinking} Scheduling appointments...[/]"); - + Util.UpdateSkips(settings, Util.BaseSkips); + if (!string.IsNullOrEmpty(settings.DotNetSdkRoot)) { sharedState.SetEnvironmentVariable("DOTNET_ROOT", settings.DotNetSdkRoot); @@ -106,21 +107,18 @@ public override async Task ExecuteAsync(CommandContext context, CheckSettin settings.TargetPlatforms = ParseTfmsToTargetPlatforms(settings); if (!string.IsNullOrEmpty(settings.Ide)) { - var currentSkips = settings.Skip?.ToList() ?? []; - switch (settings.Ide.ToLowerInvariant()) { case "rider": - currentSkips.AddRange(Util.RiderSkips); + Util.UpdateSkips(settings, Util.RiderSkips); break; case "vs": - currentSkips.AddRange(Util.VSSkips); + Util.UpdateSkips(settings, Util.VSSkips); break; case "vscode": - currentSkips.AddRange(Util.VSCodeSkips); + Util.UpdateSkips(settings, Util.VSCodeSkips); break; } - settings.Skip = currentSkips.Distinct().ToArray(); } sharedState.ContributeState(StateKey.EntryPoint, StateKey.TargetPlatforms, TargetPlatformHelper.GetTargetPlatformsFromFlags(settings.TargetPlatforms)); @@ -348,6 +346,14 @@ internal static string[] ParseTfmsToTargetPlatforms(CheckSettings settings) { var parsedTfm = NuGetFramework.ParseFolder(tfm); + // For all TFM's besides net8.0 we skip these checks. + // https://github.com/unoplatform/private/issues/506 + if (parsedTfm.Version.Major == 8) + { + var skips = settings.Skip?.ToList() ?? []; + settings.Skip = skips.Except(["git", "linuxninja", "psexecpolicy", "windowspyhtonInstallation"]).Distinct().ToArray(); + } + if (parsedTfm.Version.Major >= 5 && parsedTfm.HasPlatform == false) { // Returning empty list which means that we will target all platforms. diff --git a/UnoCheck/Util.cs b/UnoCheck/Util.cs index 5880ca4..981b981 100644 --- a/UnoCheck/Util.cs +++ b/UnoCheck/Util.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; using Spectre.Console; @@ -9,9 +10,17 @@ namespace DotNetCheck { public class Util { - public static string[] RiderSkips = ["vswin","vswinworkloads", "dotnetnewunotemplates"]; + public static string[] BaseSkips = ["git", "linuxninja", "psexecpolicy", "windowspyhtonInstallation"]; + public static string[] RiderSkips = ["vswin","vswinworkloads"]; public static string[] VSCodeSkips = ["vswin","vswinworkloads"]; - public static string[] VSSkips = ["dotnetnewunotemplates"]; + public static string[] VSSkips = ["vswin","vswinworkloads"]; + + public static void UpdateSkips(CheckSettings settings, string[] skips) + { + var currentSkips = settings.Skip?.ToList() ?? []; + currentSkips.AddRange(skips); + settings.Skip = currentSkips.Distinct().ToArray(); + } public static void LogAlways(string message) { Console.WriteLine(message); From 5deceb20576dc88161734147824f35398d8795a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 5 Feb 2025 09:59:21 -0500 Subject: [PATCH 2/2] chore: Adjust version check --- UnoCheck/CheckCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnoCheck/CheckCommand.cs b/UnoCheck/CheckCommand.cs index e432d89..30ee8ed 100644 --- a/UnoCheck/CheckCommand.cs +++ b/UnoCheck/CheckCommand.cs @@ -348,7 +348,7 @@ internal static string[] ParseTfmsToTargetPlatforms(CheckSettings settings) // For all TFM's besides net8.0 we skip these checks. // https://github.com/unoplatform/private/issues/506 - if (parsedTfm.Version.Major == 8) + if (parsedTfm.Version.Major < 9) { var skips = settings.Skip?.ToList() ?? []; settings.Skip = skips.Except(["git", "linuxninja", "psexecpolicy", "windowspyhtonInstallation"]).Distinct().ToArray();