fix: code scanning alert (#926)

* fix: code scanning alert Signed-off-by: MTsfoni <[email protected]> * fix: build warning from previous merge Signed-off-by: MTsfoni <[email protected]> --------- Signed-off-by: MTsfoni <[email protected]>
CycloneDX · Feb 2, 2025 · 7089ec9 · 7089ec9
1 parent ea4df9d
commit 7089ec9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CycloneDX/Services/DotnetCommandService.cs b/CycloneDX/Services/DotnetCommandService.cs
@@ -100,8 +100,14 @@ private static string GetDotnetPathOrDefault()
             }
             // DOTNET_ROOT specifies the location of the .NET runtimes, if they are not installed in the default location.
             var dotnetRoot = Environment.GetEnvironmentVariable("DOTNET_ROOT");
-            return !string.IsNullOrEmpty(dotnetRoot)
-                ? Path.Combine(dotnetRoot, fileName)
+
+            if (string.IsNullOrEmpty(dotnetRoot))
+            {
+                return fileName;
+            }
+            var fileInfo = new FileInfo(Path.Combine(dotnetRoot, fileName));
+            return fileInfo.Exists
+                ? fileInfo.FullName
                 : fileName;
         }
 

diff --git a/CycloneDX/Services/NugetV3Service.cs b/CycloneDX/Services/NugetV3Service.cs
@@ -130,7 +130,7 @@ private string NormalizeUri(string input)
 
             input = input.Trim();
 
-            if (Uri.TryCreate(input, ops, out Uri? result))
+            if (Uri.TryCreate(input, ops, out var result))
             {
                 return result.ToString();
             }