From 1c253c5fbc7b9979d700ae39a5744211de6e9342 Mon Sep 17 00:00:00 2001 From: "Matthew Parker [SSW]" <61717342+MattParkerDev@users.noreply.github.com> Date: Tue, 21 May 2024 19:07:26 +1000 Subject: [PATCH] fix warnings --- DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs | 3 +-- DotNetSolutionTools.Core/Common/CsprojHelper.cs | 6 ++++-- DotNetSolutionTools.Core/Infrastructure/NugetLookup.cs | 6 ++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs b/DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs index 4f15082..5dabc4b 100644 --- a/DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs +++ b/DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs @@ -116,8 +116,7 @@ public partial class MainWindowViewModel : ObservableObject await Task.Run( () => { - var solutionFile = SlnHelper.ParseSolutionFileFromPath(SolutionFilePath); - var csprojList = CsprojHelper.RetrieveAllCSharpProjectFullPathsFromSolution(solutionFile); + var csprojList = CsprojHelper.RetrieveAllCSharpProjectFullPathsFromSolution(SolutionFilePath); foreach (var csproj in csprojList) { FormatCsproj.FormatCsprojFile(csproj); diff --git a/DotNetSolutionTools.Core/Common/CsprojHelper.cs b/DotNetSolutionTools.Core/Common/CsprojHelper.cs index 3de79f4..3f50ef2 100644 --- a/DotNetSolutionTools.Core/Common/CsprojHelper.cs +++ b/DotNetSolutionTools.Core/Common/CsprojHelper.cs @@ -15,9 +15,11 @@ public static class CsprojHelper return csprojList; } - public static string[] RetrieveAllCSharpProjectFullPathsFromSolution(SolutionFile solution) + public static string[] RetrieveAllCSharpProjectFullPathsFromSolution(string solutionFilePath) { - var result = SlnHelper.GetCSharpProjectObjectsFromSolutionFile(solution); + var solutionFile = SlnHelper.ParseSolutionFileFromPath(solutionFilePath); + ArgumentNullException.ThrowIfNull(solutionFile); + var result = SlnHelper.GetCSharpProjectObjectsFromSolutionFile(solutionFile); var csprojList = result.Select(x => x.FullPath).ToArray(); return csprojList; } diff --git a/DotNetSolutionTools.Core/Infrastructure/NugetLookup.cs b/DotNetSolutionTools.Core/Infrastructure/NugetLookup.cs index 60c1fd7..e697646 100644 --- a/DotNetSolutionTools.Core/Infrastructure/NugetLookup.cs +++ b/DotNetSolutionTools.Core/Infrastructure/NugetLookup.cs @@ -1,4 +1,5 @@ -using NuGet.Common; +using System.Diagnostics.CodeAnalysis; +using NuGet.Common; using NuGet.Protocol; using NuGet.Protocol.Core.Types; using NuGet.Versioning; @@ -54,7 +55,8 @@ public static class NugetLookup return latestStableVersion; } - public static void Throw(string packageId) + [DoesNotReturn] + private static void Throw(string packageId) { throw new ArgumentNullException( "latestVersion",