From 701218a28b8bf6dfade73cc71f5994fa0c42243e Mon Sep 17 00:00:00 2001 From: Matthew Parker Date: Thu, 31 Aug 2023 21:37:54 +1000 Subject: [PATCH] Rename --- .../App.axaml | 2 +- .../App.axaml.cs | 6 ++-- .../Assets/avalonia-logo.ico | Bin .../DotNetSolutionTools.App.csproj | 2 +- .../Program.cs | 2 +- .../ViewModels/MainWindowViewModel.cs | 14 ++++---- .../ViewModels/ViewModelBase.cs | 2 +- .../Views/MainWindow.axaml | 4 +-- .../Views/MainWindow.axaml.cs | 4 +-- .../app.manifest | 0 .../Commands/CompareCommand.cs | 5 ++- .../Commands/FormatCsprojCommand.cs | 4 +-- .../Commands/ImplicitUsingsCommand.cs | 33 ++++++++++++------ .../DotNetSolutionTools.CLI.csproj | 2 +- .../Program.cs | 2 +- .../DotNetSolutionTools.Core.csproj | 0 .../FormatCsproj.cs | 2 +- .../ImplicitUsings.cs | 2 +- .../SolutionParityChecker.cs | 2 +- ...rityChecker.sln => DotNetSolutionTools.sln | 6 ++-- README.md | 2 +- 21 files changed, 55 insertions(+), 41 deletions(-) rename {SolutionParityChecker.App => DotNetSolutionTools.App}/App.axaml (82%) rename {SolutionParityChecker.App => DotNetSolutionTools.App}/App.axaml.cs (82%) rename {SolutionParityChecker.App => DotNetSolutionTools.App}/Assets/avalonia-logo.ico (100%) rename SolutionParityChecker.App/SolutionParityChecker.App.csproj => DotNetSolutionTools.App/DotNetSolutionTools.App.csproj (93%) rename {SolutionParityChecker.App => DotNetSolutionTools.App}/Program.cs (94%) rename {SolutionParityChecker.App => DotNetSolutionTools.App}/ViewModels/MainWindowViewModel.cs (93%) rename {SolutionParityChecker.App => DotNetSolutionTools.App}/ViewModels/ViewModelBase.cs (87%) rename {SolutionParityChecker.App => DotNetSolutionTools.App}/Views/MainWindow.axaml (91%) rename {SolutionParityChecker.App => DotNetSolutionTools.App}/Views/MainWindow.axaml.cs (66%) rename {SolutionParityChecker.App => DotNetSolutionTools.App}/app.manifest (100%) rename {SolutionParityChecker.CLI => DotNetSolutionTools.CLI}/Commands/CompareCommand.cs (96%) rename {SolutionParityChecker.CLI => DotNetSolutionTools.CLI}/Commands/FormatCsprojCommand.cs (97%) rename {SolutionParityChecker.CLI => DotNetSolutionTools.CLI}/Commands/ImplicitUsingsCommand.cs (82%) rename SolutionParityChecker.CLI/SolutionParityChecker.CLI.csproj => DotNetSolutionTools.CLI/DotNetSolutionTools.CLI.csproj (84%) rename {SolutionParityChecker.CLI => DotNetSolutionTools.CLI}/Program.cs (89%) rename SolutionParityChecker/SolutionParityChecker.csproj => DotNetSolutionTools.Core/DotNetSolutionTools.Core.csproj (100%) rename {SolutionParityChecker => DotNetSolutionTools.Core}/FormatCsproj.cs (95%) rename {SolutionParityChecker => DotNetSolutionTools.Core}/ImplicitUsings.cs (98%) rename {SolutionParityChecker => DotNetSolutionTools.Core}/SolutionParityChecker.cs (98%) rename SlnAndCsprojParityChecker.sln => DotNetSolutionTools.sln (78%) diff --git a/SolutionParityChecker.App/App.axaml b/DotNetSolutionTools.App/App.axaml similarity index 82% rename from SolutionParityChecker.App/App.axaml rename to DotNetSolutionTools.App/App.axaml index 2c7915e..cbc79b0 100644 --- a/SolutionParityChecker.App/App.axaml +++ b/DotNetSolutionTools.App/App.axaml @@ -1,6 +1,6 @@ diff --git a/SolutionParityChecker.App/App.axaml.cs b/DotNetSolutionTools.App/App.axaml.cs similarity index 82% rename from SolutionParityChecker.App/App.axaml.cs rename to DotNetSolutionTools.App/App.axaml.cs index b39a4d6..47ce57f 100644 --- a/SolutionParityChecker.App/App.axaml.cs +++ b/DotNetSolutionTools.App/App.axaml.cs @@ -1,10 +1,10 @@ using Avalonia; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; -using SolutionParityChecker.App.ViewModels; -using SolutionParityChecker.App.Views; +using DotNetSolutionTools.App.ViewModels; +using DotNetSolutionTools.App.Views; -namespace SolutionParityChecker.App; +namespace DotNetSolutionTools.App; public partial class App : Application { diff --git a/SolutionParityChecker.App/Assets/avalonia-logo.ico b/DotNetSolutionTools.App/Assets/avalonia-logo.ico similarity index 100% rename from SolutionParityChecker.App/Assets/avalonia-logo.ico rename to DotNetSolutionTools.App/Assets/avalonia-logo.ico diff --git a/SolutionParityChecker.App/SolutionParityChecker.App.csproj b/DotNetSolutionTools.App/DotNetSolutionTools.App.csproj similarity index 93% rename from SolutionParityChecker.App/SolutionParityChecker.App.csproj rename to DotNetSolutionTools.App/DotNetSolutionTools.App.csproj index 54cc2ec..42d8291 100644 --- a/SolutionParityChecker.App/SolutionParityChecker.App.csproj +++ b/DotNetSolutionTools.App/DotNetSolutionTools.App.csproj @@ -28,6 +28,6 @@ - + diff --git a/SolutionParityChecker.App/Program.cs b/DotNetSolutionTools.App/Program.cs similarity index 94% rename from SolutionParityChecker.App/Program.cs rename to DotNetSolutionTools.App/Program.cs index 49a281a..eea588b 100644 --- a/SolutionParityChecker.App/Program.cs +++ b/DotNetSolutionTools.App/Program.cs @@ -1,7 +1,7 @@ using System; using Avalonia; -namespace SolutionParityChecker.App; +namespace DotNetSolutionTools.App; class Program { diff --git a/SolutionParityChecker.App/ViewModels/MainWindowViewModel.cs b/DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs similarity index 93% rename from SolutionParityChecker.App/ViewModels/MainWindowViewModel.cs rename to DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs index acc706d..0deac88 100644 --- a/SolutionParityChecker.App/ViewModels/MainWindowViewModel.cs +++ b/DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs @@ -10,8 +10,9 @@ using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Platform.Storage; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; +using DotNetSolutionTools.Core; -namespace SolutionParityChecker.App.ViewModels; +namespace DotNetSolutionTools.App.ViewModels; public partial class MainWindowViewModel : ViewModelBase { @@ -33,17 +34,18 @@ public partial class MainWindowViewModel : ViewModelBase [RelayCommand] private async Task ExecuteParityChecker(CancellationToken token) { - var results = SolutionParityChecker.CompareSolutionAndCSharpProjects( - SolutionFolderPath, - SolutionFilePath - ); + var results = + DotNetSolutionTools.Core.SolutionParityChecker.CompareSolutionAndCSharpProjects( + SolutionFolderPath, + SolutionFilePath + ); ParityResults.Clear(); foreach (var result in results) { ParityResults.Add(result); } } - + [RelayCommand] private async Task FormatCsProjFile(CancellationToken token) { diff --git a/SolutionParityChecker.App/ViewModels/ViewModelBase.cs b/DotNetSolutionTools.App/ViewModels/ViewModelBase.cs similarity index 87% rename from SolutionParityChecker.App/ViewModels/ViewModelBase.cs rename to DotNetSolutionTools.App/ViewModels/ViewModelBase.cs index f85eddd..7e9a704 100644 --- a/SolutionParityChecker.App/ViewModels/ViewModelBase.cs +++ b/DotNetSolutionTools.App/ViewModels/ViewModelBase.cs @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using CommunityToolkit.Mvvm.ComponentModel; -namespace SolutionParityChecker.App.ViewModels; +namespace DotNetSolutionTools.App.ViewModels; public partial class ViewModelBase : ObservableObject { diff --git a/SolutionParityChecker.App/Views/MainWindow.axaml b/DotNetSolutionTools.App/Views/MainWindow.axaml similarity index 91% rename from SolutionParityChecker.App/Views/MainWindow.axaml rename to DotNetSolutionTools.App/Views/MainWindow.axaml index 4b0655f..472c6ba 100644 --- a/SolutionParityChecker.App/Views/MainWindow.axaml +++ b/DotNetSolutionTools.App/Views/MainWindow.axaml @@ -2,9 +2,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:viewModels="clr-namespace:SolutionParityChecker.App.ViewModels" + xmlns:viewModels="clr-namespace:DotNetSolutionTools.App.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="SolutionParityChecker.App.Views.MainWindow" + x:Class="DotNetSolutionTools.App.Views.MainWindow" x:DataType="viewModels:MainWindowViewModel" Icon="/Assets/avalonia-logo.ico" Title="FileOps"> diff --git a/SolutionParityChecker.App/Views/MainWindow.axaml.cs b/DotNetSolutionTools.App/Views/MainWindow.axaml.cs similarity index 66% rename from SolutionParityChecker.App/Views/MainWindow.axaml.cs rename to DotNetSolutionTools.App/Views/MainWindow.axaml.cs index ca21c9d..a8a82d5 100644 --- a/SolutionParityChecker.App/Views/MainWindow.axaml.cs +++ b/DotNetSolutionTools.App/Views/MainWindow.axaml.cs @@ -1,8 +1,8 @@ using Avalonia.Controls; using Avalonia.Interactivity; -using SolutionParityChecker.App.ViewModels; +using DotNetSolutionTools.App.ViewModels; -namespace SolutionParityChecker.App.Views; +namespace DotNetSolutionTools.App.Views; public partial class MainWindow : Window { diff --git a/SolutionParityChecker.App/app.manifest b/DotNetSolutionTools.App/app.manifest similarity index 100% rename from SolutionParityChecker.App/app.manifest rename to DotNetSolutionTools.App/app.manifest diff --git a/SolutionParityChecker.CLI/Commands/CompareCommand.cs b/DotNetSolutionTools.CLI/Commands/CompareCommand.cs similarity index 96% rename from SolutionParityChecker.CLI/Commands/CompareCommand.cs rename to DotNetSolutionTools.CLI/Commands/CompareCommand.cs index 2d795d4..af70e9d 100644 --- a/SolutionParityChecker.CLI/Commands/CompareCommand.cs +++ b/DotNetSolutionTools.CLI/Commands/CompareCommand.cs @@ -1,9 +1,8 @@ using System.ComponentModel; -using Microsoft.Build.Construction; -using Spectre.Console; +using DotNetSolutionTools.Core; using Spectre.Console.Cli; -namespace SolutionParityChecker.CLI.Commands; +namespace DotNetSolutionTools.CLI.Commands; public class CompareCommand : Command { diff --git a/SolutionParityChecker.CLI/Commands/FormatCsprojCommand.cs b/DotNetSolutionTools.CLI/Commands/FormatCsprojCommand.cs similarity index 97% rename from SolutionParityChecker.CLI/Commands/FormatCsprojCommand.cs rename to DotNetSolutionTools.CLI/Commands/FormatCsprojCommand.cs index 4a96c0b..4c5c195 100644 --- a/SolutionParityChecker.CLI/Commands/FormatCsprojCommand.cs +++ b/DotNetSolutionTools.CLI/Commands/FormatCsprojCommand.cs @@ -1,7 +1,7 @@ -using System.ComponentModel; +using DotNetSolutionTools.Core; using Spectre.Console.Cli; -namespace SolutionParityChecker.CLI.Commands; +namespace DotNetSolutionTools.CLI.Commands; public class FormatCsprojCommand : Command { diff --git a/SolutionParityChecker.CLI/Commands/ImplicitUsingsCommand.cs b/DotNetSolutionTools.CLI/Commands/ImplicitUsingsCommand.cs similarity index 82% rename from SolutionParityChecker.CLI/Commands/ImplicitUsingsCommand.cs rename to DotNetSolutionTools.CLI/Commands/ImplicitUsingsCommand.cs index a2b137f..0bb05c5 100644 --- a/SolutionParityChecker.CLI/Commands/ImplicitUsingsCommand.cs +++ b/DotNetSolutionTools.CLI/Commands/ImplicitUsingsCommand.cs @@ -1,7 +1,8 @@ using System.ComponentModel; +using DotNetSolutionTools.Core; using Spectre.Console.Cli; -namespace SolutionParityChecker.CLI.Commands; +namespace DotNetSolutionTools.CLI.Commands; public class ImplicitUsingsCommand : Command { @@ -14,12 +15,14 @@ public class ImplicitUsingsCommand : Command [Description("Add Implicit Usings=true to projects missing them. Default is false.")] [DefaultValue(false)] 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; - + [CommandOption("-a|--enable-all")] [Description("Enables Implicit Usings for all projects. Default is false.")] [DefaultValue(false)] @@ -39,12 +42,16 @@ public class ImplicitUsingsCommand : Command ); return 1; } - var cSharpProjects = SolutionParityChecker.GetCSharpProjectObjectsFromSolutionFile(solutionFile); + var cSharpProjects = SolutionParityChecker.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" @@ -54,15 +61,21 @@ public class ImplicitUsingsCommand : Command { Console.WriteLine(project.DirectoryPath); } - + if (settings.AddMissing) { Console.WriteLine("=================================================="); Console.WriteLine("Adding missing implicit usings"); ImplicitUsings.AddMissingImplicitUsings(projectsMissingImplicitUsings); - var updatedProjects = SolutionParityChecker.GetCSharpProjectObjectsFromSolutionFile(solutionFile); - var projectsWithMissing = ImplicitUsings.FindCSharpProjectsMissingImplicitUsings(updatedProjects); - Console.WriteLine($"There are now {projectsWithMissing.Count} C# Projects missing/disabled implicit usings"); + var updatedProjects = SolutionParityChecker.GetCSharpProjectObjectsFromSolutionFile( + solutionFile + ); + var projectsWithMissing = ImplicitUsings.FindCSharpProjectsMissingImplicitUsings( + updatedProjects + ); + Console.WriteLine( + $"There are now {projectsWithMissing.Count} C# Projects missing/disabled implicit usings" + ); } if (settings.EnableDisabled) { diff --git a/SolutionParityChecker.CLI/SolutionParityChecker.CLI.csproj b/DotNetSolutionTools.CLI/DotNetSolutionTools.CLI.csproj similarity index 84% rename from SolutionParityChecker.CLI/SolutionParityChecker.CLI.csproj rename to DotNetSolutionTools.CLI/DotNetSolutionTools.CLI.csproj index d5da327..0ee79be 100644 --- a/SolutionParityChecker.CLI/SolutionParityChecker.CLI.csproj +++ b/DotNetSolutionTools.CLI/DotNetSolutionTools.CLI.csproj @@ -15,7 +15,7 @@ - + diff --git a/SolutionParityChecker.CLI/Program.cs b/DotNetSolutionTools.CLI/Program.cs similarity index 89% rename from SolutionParityChecker.CLI/Program.cs rename to DotNetSolutionTools.CLI/Program.cs index 23effaa..0a871d1 100644 --- a/SolutionParityChecker.CLI/Program.cs +++ b/DotNetSolutionTools.CLI/Program.cs @@ -1,4 +1,4 @@ -using SolutionParityChecker.CLI.Commands; +using DotNetSolutionTools.CLI.Commands; using Spectre.Console.Cli; var app = new CommandApp(); diff --git a/SolutionParityChecker/SolutionParityChecker.csproj b/DotNetSolutionTools.Core/DotNetSolutionTools.Core.csproj similarity index 100% rename from SolutionParityChecker/SolutionParityChecker.csproj rename to DotNetSolutionTools.Core/DotNetSolutionTools.Core.csproj diff --git a/SolutionParityChecker/FormatCsproj.cs b/DotNetSolutionTools.Core/FormatCsproj.cs similarity index 95% rename from SolutionParityChecker/FormatCsproj.cs rename to DotNetSolutionTools.Core/FormatCsproj.cs index 8083fe4..797e9ea 100644 --- a/SolutionParityChecker/FormatCsproj.cs +++ b/DotNetSolutionTools.Core/FormatCsproj.cs @@ -1,7 +1,7 @@ using System.Text; using System.Xml; -namespace SolutionParityChecker; +namespace DotNetSolutionTools.Core; public static class FormatCsproj { diff --git a/SolutionParityChecker/ImplicitUsings.cs b/DotNetSolutionTools.Core/ImplicitUsings.cs similarity index 98% rename from SolutionParityChecker/ImplicitUsings.cs rename to DotNetSolutionTools.Core/ImplicitUsings.cs index d06021b..2b6be75 100644 --- a/SolutionParityChecker/ImplicitUsings.cs +++ b/DotNetSolutionTools.Core/ImplicitUsings.cs @@ -1,6 +1,6 @@ using Microsoft.Build.Construction; -namespace SolutionParityChecker; +namespace DotNetSolutionTools.Core; public static class ImplicitUsings { diff --git a/SolutionParityChecker/SolutionParityChecker.cs b/DotNetSolutionTools.Core/SolutionParityChecker.cs similarity index 98% rename from SolutionParityChecker/SolutionParityChecker.cs rename to DotNetSolutionTools.Core/SolutionParityChecker.cs index 9e57f19..47d1e2d 100644 --- a/SolutionParityChecker/SolutionParityChecker.cs +++ b/DotNetSolutionTools.Core/SolutionParityChecker.cs @@ -1,6 +1,6 @@ using Microsoft.Build.Construction; -namespace SolutionParityChecker; +namespace DotNetSolutionTools.Core; public static class SolutionParityChecker { diff --git a/SlnAndCsprojParityChecker.sln b/DotNetSolutionTools.sln similarity index 78% rename from SlnAndCsprojParityChecker.sln rename to DotNetSolutionTools.sln index 491b96c..e6c58cc 100644 --- a/SlnAndCsprojParityChecker.sln +++ b/DotNetSolutionTools.sln @@ -1,10 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SolutionParityChecker.CLI", "SolutionParityChecker.CLI\SolutionParityChecker.CLI.csproj", "{0EAC3CFF-28B2-4ACA-BC18-8148A75F89D9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetSolutionTools.CLI", "DotNetSolutionTools.CLI\DotNetSolutionTools.CLI.csproj", "{0EAC3CFF-28B2-4ACA-BC18-8148A75F89D9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SolutionParityChecker", "SolutionParityChecker\SolutionParityChecker.csproj", "{2635CBAC-0CEF-4BEE-A6FD-154796A4F467}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetSolutionTools.Core", "DotNetSolutionTools.Core\DotNetSolutionTools.Core.csproj", "{2635CBAC-0CEF-4BEE-A6FD-154796A4F467}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SolutionParityChecker.App", "SolutionParityChecker.App\SolutionParityChecker.App.csproj", "{A7F46873-C8EC-4C2E-86F5-B9F2472C8036}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SolutionParityChecker.App", "DotNetSolutionTools.App\DotNetSolutionTools.App.csproj", "{A7F46873-C8EC-4C2E-86F5-B9F2472C8036}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4B49F43F-2B01-487B-9831-6CF51AE4A977}" ProjectSection(SolutionItems) = preProject diff --git a/README.md b/README.md index 78b9411..1c5df86 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Solution Parity Checker +# Dotnet Solution Tools Various tools to manage a C# solution.