From c74db2fbbeb11307830eb54ab1013d7298966e84 Mon Sep 17 00:00:00 2001 From: Matthias Koch Date: Tue, 22 Aug 2023 01:51:55 +0200 Subject: [PATCH] fix(execution): check if nullable parameter type is assignable to IAbsolutePathHolder --- .../ArgumentsFromParametersFileAttribute.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/source/Nuke.Build/Execution/Extensions/ArgumentsFromParametersFileAttribute.cs b/source/Nuke.Build/Execution/Extensions/ArgumentsFromParametersFileAttribute.cs index b165d1e51..1a2b1c97d 100644 --- a/source/Nuke.Build/Execution/Extensions/ArgumentsFromParametersFileAttribute.cs +++ b/source/Nuke.Build/Execution/Extensions/ArgumentsFromParametersFileAttribute.cs @@ -6,10 +6,10 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using JetBrains.Annotations; using Newtonsoft.Json.Linq; using Nuke.Common.CI; using Nuke.Common.IO; -using Nuke.Common.ProjectModel; using Nuke.Common.Utilities; using Nuke.Common.Utilities.Collections; using Nuke.Common.ValueInjection; @@ -48,11 +48,10 @@ string DecryptValue(string profile, string name, string value) name); // TODO: Abstract AbsolutePath/Solution/Project etc. - string ConvertValue(Type scalarType, string value) - => scalarType.IsAssignableTo(typeof(IAbsolutePathHolder)) - ? PathConstruction.HasPathRoot(value) - ? value - : EnvironmentInfo.WorkingDirectory.GetUnixRelativePathTo(Build.RootDirectory / value) + string ConvertValue([CanBeNull] Type scalarType, string value) + => typeof(IAbsolutePathHolder).IsAssignableFrom(scalarType) && + !PathConstruction.HasPathRoot(value) + ? EnvironmentInfo.WorkingDirectory.GetUnixRelativePathTo(Build.RootDirectory / value) : value; var arguments = GetParameters().SelectMany(x => ConvertToArguments(x.Profile, x.Name, x.Values)).ToArray();