diff --git a/DotNetSolutionTools.App/Program.cs b/DotNetSolutionTools.App/Program.cs index eea588b..fe3abf1 100644 --- a/DotNetSolutionTools.App/Program.cs +++ b/DotNetSolutionTools.App/Program.cs @@ -1,5 +1,4 @@ -using System; -using Avalonia; +using Avalonia; namespace DotNetSolutionTools.App; diff --git a/DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs b/DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs index 37ed810..41c1eee 100644 --- a/DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs +++ b/DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs @@ -5,6 +5,7 @@ using CommunityToolkit.Mvvm.Input; using DotNetSolutionTools.App.Models; using DotNetSolutionTools.App.Services; using DotNetSolutionTools.Core; +using DotNetSolutionTools.Core.Common; namespace DotNetSolutionTools.App.ViewModels; @@ -35,13 +36,19 @@ public partial class MainWindowViewModel : ViewModelBase try { ResultsLabel = "Running..."; - await Task.Run(() => - { - var results = SolutionProjectParity.CompareSolutionAndCSharpProjects(SolutionFolderPath, SolutionFilePath); - foreach (var result in results) - OperationResults.Add(result); - ResultsLabel = $"{results.Count} Projects in folder missing from solution"; - }, token); + await Task.Run( + () => + { + var results = SolutionProjectParity.CompareSolutionAndCSharpProjects( + SolutionFolderPath, + SolutionFilePath + ); + foreach (var result in results) + OperationResults.Add(result); + ResultsLabel = $"{results.Count} Projects in folder missing from solution"; + }, + token + ); } catch (Exception e) { @@ -59,10 +66,13 @@ public partial class MainWindowViewModel : ViewModelBase try { ResultsLabel = "Running..."; - await Task.Run(() => - { - FormatCsproj.FormatCsprojFile(CsprojFilePath); - }, token); + await Task.Run( + () => + { + FormatCsproj.FormatCsprojFile(CsprojFilePath); + }, + token + ); ResultsLabel = "Successfully formatted csproj file"; } catch (Exception e) @@ -71,7 +81,6 @@ public partial class MainWindowViewModel : ViewModelBase OperationResults?.Add(e.Message); OperationResults?.Add(e.ToString()); } - } [RelayCommand] @@ -82,15 +91,18 @@ public partial class MainWindowViewModel : ViewModelBase try { ResultsLabel = "Running..."; - await Task.Run(() => - { - var solutionFile = SolutionProjectParity.ParseSolutionFileFromPath(SolutionFilePath); - var csprojList = SolutionProjectParity.RetrieveAllCSharpProjectFullPathsFromSolution(solutionFile); - foreach (var csproj in csprojList) + await Task.Run( + () => { - FormatCsproj.FormatCsprojFile(csproj); - } - }, token); + var solutionFile = SlnHelper.ParseSolutionFileFromPath(SolutionFilePath); + var csprojList = CsprojHelper.RetrieveAllCSharpProjectFullPathsFromSolution(solutionFile); + foreach (var csproj in csprojList) + { + FormatCsproj.FormatCsprojFile(csproj); + } + }, + token + ); ResultsLabel = "Successfully formatted all csproj files in solution file"; } catch (Exception e) @@ -108,14 +120,17 @@ public partial class MainWindowViewModel : ViewModelBase try { ResultsLabel = "Running..."; - await Task.Run(() => - { - var csprojList = SolutionProjectParity.RetrieveAllCSharpProjectFullPathsFromFolder(SolutionFolderPath); - foreach (var csproj in csprojList) + await Task.Run( + () => { - FormatCsproj.FormatCsprojFile(csproj); - } - }, token); + var csprojList = CsprojHelper.RetrieveAllCSharpProjectFullPathsFromFolder(SolutionFolderPath); + foreach (var csproj in csprojList) + { + FormatCsproj.FormatCsprojFile(csproj); + } + }, + token + ); ResultsLabel = "Successfully formatted all csproj files in folder"; } catch (Exception e) @@ -134,12 +149,15 @@ public partial class MainWindowViewModel : ViewModelBase try { ResultsLabel = "Running..."; - await Task.Run(() => - { - var results = ImplicitUsings.FindCSharpProjectsMissingImplicitUsings(SolutionFilePath); - results.ForEach(s => OperationResults.Add(s)); - ResultsLabel = $"{results.Count} Projects missing ImplicitUsings"; - }, token); + await Task.Run( + () => + { + var results = ImplicitUsings.FindCSharpProjectsMissingImplicitUsings(SolutionFilePath); + results.ForEach(s => OperationResults.Add(s)); + ResultsLabel = $"{results.Count} Projects missing ImplicitUsings"; + }, + token + ); } catch (Exception e) { @@ -157,12 +175,15 @@ public partial class MainWindowViewModel : ViewModelBase try { ResultsLabel = "Running..."; - await Task.Run(() => - { - var results = WarningsAsErrors.FindCSharpProjectsMissingTreatWarningsAsErrors(SolutionFilePath); - results.ForEach(s => OperationResults.Add(s)); - ResultsLabel = $"{results.Count} Projects missing TreatWarningsAsErrors"; - }, token); + await Task.Run( + () => + { + var results = WarningsAsErrors.FindCSharpProjectsMissingTreatWarningsAsErrors(SolutionFilePath); + results.ForEach(s => OperationResults.Add(s)); + ResultsLabel = $"{results.Count} Projects missing TreatWarningsAsErrors"; + }, + token + ); } catch (Exception e) { @@ -180,10 +201,13 @@ public partial class MainWindowViewModel : ViewModelBase try { ResultsLabel = "Running..."; - await Task.Run(() => - { - CleanFolder.DeleteBinObjAndNodeModulesFoldersInFolder(SolutionFolderPath); - }, token); + await Task.Run( + () => + { + CleanFolder.DeleteBinObjAndNodeModulesFoldersInFolder(SolutionFolderPath); + }, + token + ); ResultsLabel = "Successfully deleted bin and obj folders"; } catch (Exception e) @@ -191,7 +215,6 @@ public partial class MainWindowViewModel : ViewModelBase ResultsLabel = "Failed to delete bin and obj folders"; OperationResults?.Add(e.Message); OperationResults?.Add(e.ToString()); - } } @@ -203,10 +226,13 @@ public partial class MainWindowViewModel : ViewModelBase try { ResultsLabel = "Running..."; - await Task.Run(async () => - { - await DotNetUpgrade.UpdateProjectsInSolutionToNet80(SolutionFilePath); - }, token); + await Task.Run( + async () => + { + await DotNetUpgrade.UpdateProjectsInSolutionToNet80(SolutionFilePath); + }, + token + ); ResultsLabel = "Successfully updated all projects in solution to .NET 8"; } catch (Exception e) @@ -225,10 +251,13 @@ public partial class MainWindowViewModel : ViewModelBase try { ResultsLabel = "Running..."; - await Task.Run(async () => - { - await DotNetUpgrade.UpdateProjectAtPathToNet80(CsprojFilePath); - }, token); + await Task.Run( + async () => + { + await DotNetUpgrade.UpdateProjectAtPathToNet80(CsprojFilePath); + }, + token + ); ResultsLabel = "Successfully updated project to .NET 8"; } catch (Exception e) diff --git a/DotNetSolutionTools.App/ViewModels/ViewModelBase.cs b/DotNetSolutionTools.App/ViewModels/ViewModelBase.cs index b52c405..9baf724 100644 --- a/DotNetSolutionTools.App/ViewModels/ViewModelBase.cs +++ b/DotNetSolutionTools.App/ViewModels/ViewModelBase.cs @@ -1,5 +1,4 @@ -using System.Collections.ObjectModel; -using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; namespace DotNetSolutionTools.App.ViewModels; diff --git a/DotNetSolutionTools.CLI/Commands/ClearBinObjCommand.cs b/DotNetSolutionTools.CLI/Commands/ClearBinObjCommand.cs index 2dfe643..63f73fa 100644 --- a/DotNetSolutionTools.CLI/Commands/ClearBinObjCommand.cs +++ b/DotNetSolutionTools.CLI/Commands/ClearBinObjCommand.cs @@ -1,5 +1,4 @@ -using System.ComponentModel; -using DotNetSolutionTools.Core; +using DotNetSolutionTools.Core; using Spectre.Console.Cli; namespace DotNetSolutionTools.CLI.Commands; diff --git a/DotNetSolutionTools.CLI/Commands/CompareCommand.cs b/DotNetSolutionTools.CLI/Commands/CompareCommand.cs index dd601af..f6ceb4b 100644 --- a/DotNetSolutionTools.CLI/Commands/CompareCommand.cs +++ b/DotNetSolutionTools.CLI/Commands/CompareCommand.cs @@ -1,5 +1,6 @@ using System.ComponentModel; using DotNetSolutionTools.Core; +using DotNetSolutionTools.Core.Common; using Spectre.Console.Cli; namespace DotNetSolutionTools.CLI.Commands; @@ -15,9 +16,7 @@ public class CompareCommand : Command public required string SolutionFilePath { get; set; } [CommandOption("-l|--logprojectfiles")] - [Description( - "true to enable log output of all project files found in folder. Default is false." - )] + [Description("true to enable log output of all project files found in folder. Default is false.")] [DefaultValue(false)] public bool LogAllProjectFileNames { get; set; } = false; } @@ -28,9 +27,7 @@ public class CompareCommand : Command var pathToSolutionFile = settings.SolutionFilePath; Console.WriteLine($"Retrieving C# Projects from {folderDirectory}"); - var csprojList = SolutionProjectParity.RetrieveAllCSharpProjectNamesFromFolder( - folderDirectory - ); + var csprojList = CsprojHelper.RetrieveAllCSharpProjectFullPathsFromFolder(folderDirectory); if (settings.LogAllProjectFileNames) { @@ -45,12 +42,10 @@ public class CompareCommand : Command Console.WriteLine($"Parsing Solution File: {pathToSolutionFile}"); // Load the solution file - var solutionFile = SolutionProjectParity.ParseSolutionFileFromPath(pathToSolutionFile); + var solutionFile = SlnHelper.ParseSolutionFileFromPath(pathToSolutionFile); if (solutionFile == null) { - Console.WriteLine( - "Failed to parse solution file. The file was either not found or malformed." - ); + Console.WriteLine("Failed to parse solution file. The file was either not found or malformed."); return 1; } @@ -61,9 +56,7 @@ public class CompareCommand : Command ); Console.WriteLine("=================================================="); - Console.WriteLine( - $"Missing {projectsMissingFromSolution.Count} C# Projects from Solution File" - ); + Console.WriteLine($"Missing {projectsMissingFromSolution.Count} C# Projects from Solution File"); foreach (var project in projectsMissingFromSolution) { diff --git a/DotNetSolutionTools.CLI/Commands/FormatCsprojCommand.cs b/DotNetSolutionTools.CLI/Commands/FormatCsprojCommand.cs index 242599f..8b7ecb4 100644 --- a/DotNetSolutionTools.CLI/Commands/FormatCsprojCommand.cs +++ b/DotNetSolutionTools.CLI/Commands/FormatCsprojCommand.cs @@ -1,4 +1,5 @@ using DotNetSolutionTools.Core; +using DotNetSolutionTools.Core.Common; using Spectre.Console.Cli; namespace DotNetSolutionTools.CLI.Commands; @@ -29,17 +30,13 @@ public class FormatCsprojCommand : Command } else if (!string.IsNullOrWhiteSpace(settings.SolutionFilePath)) { - var test = SolutionProjectParity.ParseSolutionFileFromPath(settings.SolutionFilePath); + var test = SlnHelper.ParseSolutionFileFromPath(settings.SolutionFilePath); if (test == null) { - Console.WriteLine( - "Failed to parse solution file. The file was either not found or malformed." - ); + Console.WriteLine("Failed to parse solution file. The file was either not found or malformed."); return 1; } - var cSharpProjects = SolutionProjectParity.GetCSharpProjectObjectsFromSolutionFile( - test - ); + var cSharpProjects = SlnHelper.GetCSharpProjectObjectsFromSolutionFile(test); Console.WriteLine($"Found {cSharpProjects.Count} C# Projects"); Console.WriteLine("=================================================="); foreach (var project in cSharpProjects) @@ -54,9 +51,7 @@ public class FormatCsprojCommand : Command var folderDirectory = settings.SolutionFolderPath; // Include the trailing slash Console.WriteLine($"Retrieving C# Projects from {folderDirectory}"); - var csprojList = SolutionProjectParity.RetrieveAllCSharpProjectFullPathsFromFolder( - folderDirectory - ); + var csprojList = CsprojHelper.RetrieveAllCSharpProjectFullPathsFromFolder(folderDirectory); Console.WriteLine($"Retrieved {csprojList.Length} C# Projects"); Console.WriteLine("=================================================="); @@ -70,9 +65,7 @@ public class FormatCsprojCommand : Command } else { - Console.WriteLine( - "No arguments were provided. Please provide a csproj, folder, or solution file." - ); + Console.WriteLine("No arguments were provided. Please provide a csproj, folder, or solution file."); return 1; } } diff --git a/DotNetSolutionTools.CLI/Commands/ImplicitUsingsCommand.cs b/DotNetSolutionTools.CLI/Commands/ImplicitUsingsCommand.cs index 03f306e..7ed2375 100644 --- a/DotNetSolutionTools.CLI/Commands/ImplicitUsingsCommand.cs +++ b/DotNetSolutionTools.CLI/Commands/ImplicitUsingsCommand.cs @@ -1,5 +1,6 @@ using System.ComponentModel; using DotNetSolutionTools.Core; +using DotNetSolutionTools.Core.Common; using Spectre.Console.Cli; namespace DotNetSolutionTools.CLI.Commands; @@ -17,9 +18,7 @@ public class ImplicitUsingsCommand : Command public bool AddMissing { get; set; } = false; [CommandOption("-d|--enable-disabled")] - [Description( - "Sets Implicit Usings to true for any projects with it disabled. Default is false." - )] + [Description("Sets Implicit Usings to true for any projects with it disabled. Default is false.")] [DefaultValue(false)] public bool EnableDisabled { get; set; } = false; @@ -34,24 +33,18 @@ public class ImplicitUsingsCommand : Command var pathToSolutionFile = settings.SolutionFilePath; Console.WriteLine($"Retrieving Solution from {pathToSolutionFile}"); - var solutionFile = SolutionProjectParity.ParseSolutionFileFromPath(pathToSolutionFile); + var solutionFile = SlnHelper.ParseSolutionFileFromPath(pathToSolutionFile); if (solutionFile == null) { - Console.WriteLine( - "Failed to parse solution file. The file was either not found or malformed." - ); + Console.WriteLine("Failed to parse solution file. The file was either not found or malformed."); return 1; } - var cSharpProjects = SolutionProjectParity.GetCSharpProjectObjectsFromSolutionFile( - solutionFile - ); + var cSharpProjects = SlnHelper.GetCSharpProjectObjectsFromSolutionFile(solutionFile); Console.WriteLine($"Found {cSharpProjects.Count} C# Projects"); Console.WriteLine("=================================================="); // Get the list of projects - var projectsMissingImplicitUsings = ImplicitUsings.FindCSharpProjectsMissingImplicitUsings( - cSharpProjects - ); + var projectsMissingImplicitUsings = ImplicitUsings.FindCSharpProjectsMissingImplicitUsings(cSharpProjects); Console.WriteLine( $"{projectsMissingImplicitUsings.Count} C# Projects have missing or disabled implicit usings" @@ -67,12 +60,8 @@ public class ImplicitUsingsCommand : Command Console.WriteLine("=================================================="); Console.WriteLine("Adding missing implicit usings"); ImplicitUsings.AddMissingImplicitUsings(projectsMissingImplicitUsings); - var updatedProjects = SolutionProjectParity.GetCSharpProjectObjectsFromSolutionFile( - solutionFile - ); - var projectsWithMissing = ImplicitUsings.FindCSharpProjectsMissingImplicitUsings( - updatedProjects - ); + var updatedProjects = SlnHelper.GetCSharpProjectObjectsFromSolutionFile(solutionFile); + var projectsWithMissing = ImplicitUsings.FindCSharpProjectsMissingImplicitUsings(updatedProjects); Console.WriteLine( $"There are now {projectsWithMissing.Count} C# Projects missing/disabled implicit usings" ); diff --git a/DotNetSolutionTools.CLI/Commands/TreatWarningsAsErrorsCommand.cs b/DotNetSolutionTools.CLI/Commands/TreatWarningsAsErrorsCommand.cs index 6b980e3..41cd94f 100644 --- a/DotNetSolutionTools.CLI/Commands/TreatWarningsAsErrorsCommand.cs +++ b/DotNetSolutionTools.CLI/Commands/TreatWarningsAsErrorsCommand.cs @@ -1,5 +1,6 @@ using System.ComponentModel; using DotNetSolutionTools.Core; +using DotNetSolutionTools.Core.Common; using Spectre.Console.Cli; namespace DotNetSolutionTools.CLI.Commands; @@ -21,13 +22,13 @@ public class TreatWarningsAsErrorsCommand : Command +{ + public sealed class Settings : CommandSettings + { + [CommandArgument(1, "")] + public required string CsprojFilePath { get; set; } + } + + public override int Execute(CommandContext context, Settings settings) + { + // validate a real folder path was passed in + if (!Directory.Exists(settings.CsprojFilePath)) + { + Console.WriteLine("Invalid folder path"); + return 1; + } + Console.WriteLine("Deleting bin, obj, and node_modules folders"); + CleanFolder.DeleteBinObjAndNodeModulesFoldersInFolder(settings.CsprojFilePath); + + Console.WriteLine("=================================================="); + Console.WriteLine("Done!"); + return 0; + } +} diff --git a/DotNetSolutionTools.Core/Common/CsprojHelper.cs b/DotNetSolutionTools.Core/Common/CsprojHelper.cs new file mode 100644 index 0000000..3de79f4 --- /dev/null +++ b/DotNetSolutionTools.Core/Common/CsprojHelper.cs @@ -0,0 +1,24 @@ +using Microsoft.Build.Construction; + +namespace DotNetSolutionTools.Core.Common; + +public static class CsprojHelper +{ + public static string[] RetrieveAllCSharpProjectFullPathsFromFolder(string solutionFolderPath) + { + // if solutionFolderPath does not end with a slash, add one + if (solutionFolderPath[^1] != Path.DirectorySeparatorChar) + { + solutionFolderPath += Path.DirectorySeparatorChar; + } + var csprojList = Directory.GetFiles(solutionFolderPath, "*.csproj", SearchOption.AllDirectories); + return csprojList; + } + + public static string[] RetrieveAllCSharpProjectFullPathsFromSolution(SolutionFile solution) + { + var result = SlnHelper.GetCSharpProjectObjectsFromSolutionFile(solution); + var csprojList = result.Select(x => x.FullPath).ToArray(); + return csprojList; + } +} diff --git a/DotNetSolutionTools.Core/Common/SlnHelper.cs b/DotNetSolutionTools.Core/Common/SlnHelper.cs new file mode 100644 index 0000000..5063d6f --- /dev/null +++ b/DotNetSolutionTools.Core/Common/SlnHelper.cs @@ -0,0 +1,23 @@ +using Microsoft.Build.Construction; + +namespace DotNetSolutionTools.Core.Common; + +public static class SlnHelper +{ + public static SolutionFile? ParseSolutionFileFromPath(string solutionFilePath) + { + var solutionFile = SolutionFile.Parse(solutionFilePath); + + return solutionFile; + } + + public static List GetCSharpProjectObjectsFromSolutionFile(SolutionFile solutionFile) + { + var projectList = solutionFile + .ProjectsByGuid.Where(x => x.Value.ProjectType == SolutionProjectType.KnownToBeMSBuildFormat) + .Select(s => ProjectRootElement.Open(s.Value.AbsolutePath)) + .ToList(); + + return projectList; + } +} diff --git a/DotNetSolutionTools.Core/DotNetUpgrade.cs b/DotNetSolutionTools.Core/DotNetUpgrade.cs index f6c01ce..abcadac 100644 --- a/DotNetSolutionTools.Core/DotNetUpgrade.cs +++ b/DotNetSolutionTools.Core/DotNetUpgrade.cs @@ -1,4 +1,5 @@ -using DotNetSolutionTools.Core.Infrastructure; +using DotNetSolutionTools.Core.Common; +using DotNetSolutionTools.Core.Infrastructure; using Microsoft.Build.Construction; using Microsoft.Build.Definition; using Microsoft.Build.Evaluation; @@ -11,7 +12,7 @@ public static class DotNetUpgrade public static async Task UpdateProjectsInSolutionToNet80(string solutionFilePath) { var solutionFile = SolutionFile.Parse(solutionFilePath); - var csprojList = SolutionProjectParity.GetCSharpProjectObjectsFromSolutionFile(solutionFile); + var csprojList = SlnHelper.GetCSharpProjectObjectsFromSolutionFile(solutionFile); await UpdateProjectsToNet80(csprojList); } @@ -32,8 +33,7 @@ public static class DotNetUpgrade private static async Task UpdateProjectToNet80(ProjectRootElement project) { var targetFramework = project - .PropertyGroups - .SelectMany(x => x.Properties) + .PropertyGroups.SelectMany(x => x.Properties) .FirstOrDefault(x => x.Name == "TargetFramework"); if (targetFramework?.Value is "net8.0" or "net7.0" or "net6.0" or "net5.0") { @@ -57,27 +57,20 @@ public static class DotNetUpgrade new ProjectOptions() { LoadSettings = ProjectLoadSettings.IgnoreMissingImports } ); var packages = evalProject - .Items - .Where( - x => - x.ItemType == "PackageReference" - && x.HasMetadata("Version") - && x.EvaluatedInclude.StartsWith("Microsoft.") + .Items.Where(x => + x.ItemType == "PackageReference" + && x.HasMetadata("Version") + && x.EvaluatedInclude.StartsWith("Microsoft.") ) .ToList(); var packageNameAndVersion = packages - .Select( - x => - new - { - Package = x, - Name = x.EvaluatedInclude, - NugetVersion = NuGetVersion.Parse( - x.Metadata.First(s => s.Name == "Version").UnevaluatedValue - ) - } - ) + .Select(x => new + { + Package = x, + Name = x.EvaluatedInclude, + NugetVersion = NuGetVersion.Parse(x.Metadata.First(s => s.Name == "Version").UnevaluatedValue) + }) .ToList(); var shouldSave = false; diff --git a/DotNetSolutionTools.Core/ImplicitUsings.cs b/DotNetSolutionTools.Core/ImplicitUsings.cs index 4214525..65a2001 100644 --- a/DotNetSolutionTools.Core/ImplicitUsings.cs +++ b/DotNetSolutionTools.Core/ImplicitUsings.cs @@ -1,4 +1,5 @@ -using Microsoft.Build.Construction; +using DotNetSolutionTools.Core.Common; +using Microsoft.Build.Construction; namespace DotNetSolutionTools.Core; @@ -7,27 +8,21 @@ public static class ImplicitUsings public static List FindCSharpProjectsMissingImplicitUsings(string solutionFilePath) { var solutionFile = SolutionFile.Parse(solutionFilePath); - var csprojList = SolutionProjectParity.GetCSharpProjectObjectsFromSolutionFile( - solutionFile - ); + var csprojList = SlnHelper.GetCSharpProjectObjectsFromSolutionFile(solutionFile); var projectsMissingImplicitUsings = FindCSharpProjectsMissingImplicitUsings(csprojList); - var projectsMissingImplicitUsingsStringList = projectsMissingImplicitUsings - .Select(x => x.FullPath) - .ToList(); + var projectsMissingImplicitUsingsStringList = projectsMissingImplicitUsings.Select(x => x.FullPath).ToList(); return projectsMissingImplicitUsingsStringList; } - public static List FindCSharpProjectsMissingImplicitUsings( - List projectList - ) + public static List FindCSharpProjectsMissingImplicitUsings(List projectList) { var projectsMissingImplicitUsings = new List(); foreach (var project in projectList) { - var implicitUsings = project.PropertyGroups - .SelectMany(x => x.Properties) + var implicitUsings = project + .PropertyGroups.SelectMany(x => x.Properties) .FirstOrDefault(x => x.Name == "ImplicitUsings"); if (implicitUsings is null || implicitUsings.Value is not "enable") { @@ -38,9 +33,7 @@ public static class ImplicitUsings return projectsMissingImplicitUsings; } - public static void AddMissingImplicitUsings( - List projectsMissingImplicitUsings - ) + public static void AddMissingImplicitUsings(List projectsMissingImplicitUsings) { foreach (var project in projectsMissingImplicitUsings) { @@ -53,24 +46,20 @@ public static class ImplicitUsings } } - public static void EnableDisabledImplicitUsings( - List projectsMissingImplicitUsings - ) + public static void EnableDisabledImplicitUsings(List projectsMissingImplicitUsings) { throw new NotImplementedException(); } - public static void EnableAllImplicitUsings( - List projectsMissingImplicitUsings - ) + public static void EnableAllImplicitUsings(List projectsMissingImplicitUsings) { throw new NotImplementedException(); } public static bool ProjectIsMissingImplicitUsings(ProjectRootElement project) { - var implicitUsings = project.PropertyGroups - .SelectMany(x => x.Properties) + var implicitUsings = project + .PropertyGroups.SelectMany(x => x.Properties) .FirstOrDefault(x => x.Name == "ImplicitUsings"); if (implicitUsings is null) { diff --git a/DotNetSolutionTools.Core/SolutionProjectParity.cs b/DotNetSolutionTools.Core/SolutionProjectParity.cs index 099da56..39b76ba 100644 --- a/DotNetSolutionTools.Core/SolutionProjectParity.cs +++ b/DotNetSolutionTools.Core/SolutionProjectParity.cs @@ -1,69 +1,30 @@ -using Microsoft.Build.Construction; +using DotNetSolutionTools.Core.Common; +using Microsoft.Build.Construction; namespace DotNetSolutionTools.Core; public static class SolutionProjectParity { - public static List CompareSolutionAndCSharpProjects( - string solutionFolderPath, - string solutionFilePath - ) + public static List CompareSolutionAndCSharpProjects(string solutionFolderPath, string solutionFilePath) { - var csprojList = RetrieveAllCSharpProjectNamesFromFolder(solutionFolderPath); - var solutionFile = ParseSolutionFileFromPath(solutionFilePath); + var csprojList = CsprojHelper.RetrieveAllCSharpProjectFullPathsFromFolder(solutionFolderPath); + var solutionFile = SlnHelper.ParseSolutionFileFromPath(solutionFilePath); ArgumentNullException.ThrowIfNull(solutionFile); var projectsMissingFromSolution = FindProjectsMissingFromSolution(csprojList, solutionFile); return projectsMissingFromSolution; } - public static string[] RetrieveAllCSharpProjectNamesFromFolder(string solutionFolderPath) - { - var csprojList = RetrieveAllCSharpProjectFullPathsFromFolder(solutionFolderPath); - - return csprojList; - } - - public static string[] RetrieveAllCSharpProjectFullPathsFromFolder(string solutionFolderPath) - { - // if solutionFolderPath does not end with a slash, add one - if (solutionFolderPath[^1] != Path.DirectorySeparatorChar) - { - solutionFolderPath += Path.DirectorySeparatorChar; - } - var csprojList = Directory.GetFiles( - solutionFolderPath, - "*.csproj", - SearchOption.AllDirectories - ); - return csprojList; - } - - public static string[] RetrieveAllCSharpProjectFullPathsFromSolution(SolutionFile solution) - { - var result = GetCSharpProjectObjectsFromSolutionFile(solution); - var csprojList = result.Select(x => x.FullPath).ToArray(); - return csprojList; - } - - public static SolutionFile? ParseSolutionFileFromPath(string solutionFilePath) - { - var solutionFile = SolutionFile.Parse(solutionFilePath); - - return solutionFile; - } - - public static List FindProjectsMissingFromSolution( - string[] csprojList, - SolutionFile solutionFile - ) + public static List FindProjectsMissingFromSolution(string[] csprojList, SolutionFile solutionFile) { var projects = solutionFile.ProjectsInOrder; var projectsMissingFromSolution = new List(); foreach (var project in csprojList) { - var projectInSolution = projects.FirstOrDefault(x => NormalizePath(x.AbsolutePath) == NormalizePath(project)); + var projectInSolution = projects.FirstOrDefault(x => + NormalizePath(x.AbsolutePath) == NormalizePath(project) + ); if (projectInSolution == null) { @@ -74,18 +35,6 @@ public static class SolutionProjectParity return projectsMissingFromSolution; } - public static List GetCSharpProjectObjectsFromSolutionFile( - SolutionFile solutionFile - ) - { - var projectList = solutionFile.ProjectsByGuid - .Where(x => x.Value.ProjectType == SolutionProjectType.KnownToBeMSBuildFormat) - .Select(s => ProjectRootElement.Open(s.Value.AbsolutePath)) - .ToList(); - - return projectList; - } - private static string NormalizePath(string path) { return Path.GetFullPath(new Uri(path).LocalPath) diff --git a/DotNetSolutionTools.Core/WarningsAsErrors.cs b/DotNetSolutionTools.Core/WarningsAsErrors.cs index 2ac40ba..bc43c49 100644 --- a/DotNetSolutionTools.Core/WarningsAsErrors.cs +++ b/DotNetSolutionTools.Core/WarningsAsErrors.cs @@ -1,4 +1,5 @@ -using Microsoft.Build.Construction; +using DotNetSolutionTools.Core.Common; +using Microsoft.Build.Construction; namespace DotNetSolutionTools.Core; @@ -7,7 +8,7 @@ public static class WarningsAsErrors public static List FindCSharpProjectsMissingTreatWarningsAsErrors(string solutionFilePath) { var solutionFile = SolutionFile.Parse(solutionFilePath); - var csprojList = SolutionProjectParity.GetCSharpProjectObjectsFromSolutionFile(solutionFile); + var csprojList = SlnHelper.GetCSharpProjectObjectsFromSolutionFile(solutionFile); var projectsMissingImplicitUsings = FindCSharpProjectsMissingTreatWarningsAsErrors(csprojList); var projectsMissingImplicitUsingsStringList = projectsMissingImplicitUsings.Select(x => x.FullPath).ToList(); @@ -37,7 +38,7 @@ public static class WarningsAsErrors public static void AddMissingTreatWarningsAsErrorsToSolution(string solutionFilePath) { var solutionFile = SolutionFile.Parse(solutionFilePath); - var csprojList = SolutionProjectParity.GetCSharpProjectObjectsFromSolutionFile(solutionFile); + var csprojList = SlnHelper.GetCSharpProjectObjectsFromSolutionFile(solutionFile); var projectsMissingImplicitUsings = FindCSharpProjectsMissingTreatWarningsAsErrors(csprojList); AddMissingTreatWarningsAsErrors(projectsMissingImplicitUsings); } @@ -45,7 +46,7 @@ public static class WarningsAsErrors public static void RemoveAllTreatWarningsAsErrorsInSolution(string solutionFilePath) { var solutionFile = SolutionFile.Parse(solutionFilePath); - var csprojList = SolutionProjectParity.GetCSharpProjectObjectsFromSolutionFile(solutionFile); + var csprojList = SlnHelper.GetCSharpProjectObjectsFromSolutionFile(solutionFile); RemoveTreatWarningsAsErrors(csprojList); } diff --git a/README.md b/README.md index b037741..6c51263 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ _options_ _options_ `-m|--add-missing` adds missing TreatWarningsAsErrors to all project files -**clear-bin-obj** `` **NOT IMPLEMENTED IN CLI YET** Deletes all bin and obj folders, and node_modules folders in the solution folder. +**clear-bin-obj** `` Deletes all bin and obj folders, and node_modules folders in the solution folder. **update-sln-net80** `` **NOT IMPLEMENTED IN CLI YET** Updates all projects and Microsoft NuGet packages in sln to .NET 8.0.