From 431be21039a40d2a6486dc754148685333ea82c8 Mon Sep 17 00:00:00 2001 From: Andrei Ignat Date: Mon, 21 Oct 2024 22:25:05 +0300 Subject: [PATCH] refactoring code --- src/NetPackageAnalyzer/NPA.HtmlData/ExtractImages.cs | 4 +--- src/NetPackageAnalyzer/NPA.HtmlData/globals.cs | 7 +------ .../NetPackageAnalyzerConsole/Program.cs | 5 +---- .../NetPackageAnalyzerConsole/RealMain.cs | 3 --- .../NetPackageAnalyzerConsole/globals.cs | 7 +++++-- .../NetPackageAnalyzerExportHTML/GenerateHTML.cs | 5 +---- .../NetPackageAnalyzerExportHTML/globals.cs | 3 ++- .../NetPackageAnalyzerMetricsMSFT/GenericMetrics.cs | 4 +--- .../NetPackageAnalyzerMetricsMSFT/Metric.cs | 4 +--- .../NetPackageAnalyzerMetricsMSFT/globals.cs | 2 ++ .../NetPackageAnalyzerObjects/GenerateData.cs | 8 +------- .../NetPackageAnalyzerObjects/ProcessOutput.cs | 3 +-- .../NetPackageAnalyzerObjects/ProjectData.cs | 5 +---- .../NetPackageAnalyzerObjects/globals.cs | 5 ++++- .../NetPackageAnalyzerShowInConsole/WriteToConsole.cs | 5 +---- .../NetPackageAnalyzerShowInConsole/globals.cs | 4 +++- .../NetPackageAnalyzerWork/GenerateFilesDocusaurus.cs | 4 +--- 17 files changed, 27 insertions(+), 51 deletions(-) create mode 100644 src/NetPackageAnalyzer/NetPackageAnalyzerMetricsMSFT/globals.cs diff --git a/src/NetPackageAnalyzer/NPA.HtmlData/ExtractImages.cs b/src/NetPackageAnalyzer/NPA.HtmlData/ExtractImages.cs index 4d8be6f7..5f198eaf 100644 --- a/src/NetPackageAnalyzer/NPA.HtmlData/ExtractImages.cs +++ b/src/NetPackageAnalyzer/NPA.HtmlData/ExtractImages.cs @@ -1,6 +1,4 @@ -using Microsoft.Playwright; - -namespace NPA.HtmlData; +namespace NPA.HtmlData; public class ExtractImages { diff --git a/src/NetPackageAnalyzer/NPA.HtmlData/globals.cs b/src/NetPackageAnalyzer/NPA.HtmlData/globals.cs index 68ea132c..06db272a 100644 --- a/src/NetPackageAnalyzer/NPA.HtmlData/globals.cs +++ b/src/NetPackageAnalyzer/NPA.HtmlData/globals.cs @@ -1,7 +1,2 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +global using Microsoft.Playwright; -namespace NPA.HtmlData; diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerConsole/Program.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerConsole/Program.cs index 244a7fe7..bc815c22 100644 --- a/src/NetPackageAnalyzer/NetPackageAnalyzerConsole/Program.cs +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerConsole/Program.cs @@ -1,7 +1,4 @@ -using NPA.GitInfo; -using System.Runtime; - -try +try { //Console.WriteLine($"Name:{TheAssemblyInfo.GeneratedName}"); Console.WriteLine($"{TheAssemblyInfo.GeneratedNameNice}"); diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerConsole/RealMain.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerConsole/RealMain.cs index aa6e6976..8311c9e4 100644 --- a/src/NetPackageAnalyzer/NetPackageAnalyzerConsole/RealMain.cs +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerConsole/RealMain.cs @@ -1,7 +1,4 @@  -using NetPackageAnalyzerExportHTML; -using NPA.GitInfo; -using System.Runtime.InteropServices; namespace NetPackageAnalyzerConsole; internal class RealMainExecuting diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerConsole/globals.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerConsole/globals.cs index f5d5c14c..d70d12e0 100644 --- a/src/NetPackageAnalyzer/NetPackageAnalyzerConsole/globals.cs +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerConsole/globals.cs @@ -1,6 +1,5 @@ global using NetPackageAnalyzerConsole; global using System.Diagnostics; -global using System.Text.Json; //global using NS_; global using static System.Console; global using System.CommandLine; @@ -10,4 +9,8 @@ //global using WhatIAmDoingData; global using NetPackageAnalyzerShowInConsole; global using RSCG_InterceptMethodCommon; -global using Generated.NetPackageAnalyzerConsole; \ No newline at end of file +global using Generated.NetPackageAnalyzerConsole; +global using NPA.GitInfo; +global using NetPackageAnalyzerExportHTML; +global using System.Runtime.InteropServices; + diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerExportHTML/GenerateHTML.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerExportHTML/GenerateHTML.cs index a510f96b..465b0668 100644 --- a/src/NetPackageAnalyzer/NetPackageAnalyzerExportHTML/GenerateHTML.cs +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerExportHTML/GenerateHTML.cs @@ -1,7 +1,4 @@ -using NetPackageAnalyzerObjects; -using NPA.HtmlData; - -namespace NetPackageAnalyzerExportHTML; +namespace NetPackageAnalyzerExportHTML; public class GenerateHTML : GenerateFiles { diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerExportHTML/globals.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerExportHTML/globals.cs index 8295d7fe..3f75c979 100644 --- a/src/NetPackageAnalyzer/NetPackageAnalyzerExportHTML/globals.cs +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerExportHTML/globals.cs @@ -3,4 +3,5 @@ global using NetPackageAnalyzerExportHTML.Templates; global using NetPackageAnalyzerMetricsMSFT; global using NPA.Resources; -global using Statistical; \ No newline at end of file +global using Statistical; +global using NPA.HtmlData; diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerMetricsMSFT/GenericMetrics.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerMetricsMSFT/GenericMetrics.cs index dd99d52b..52c1d067 100644 --- a/src/NetPackageAnalyzer/NetPackageAnalyzerMetricsMSFT/GenericMetrics.cs +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerMetricsMSFT/GenericMetrics.cs @@ -1,6 +1,4 @@ -using System.ComponentModel.DataAnnotations; -using System.Xml; -//https://learn.microsoft.com/en-us/visualstudio/code-quality/code-metrics-cyclomatic-complexity?view=vs-2022 +//https://learn.microsoft.com/en-us/visualstudio/code-quality/code-metrics-cyclomatic-complexity?view=vs-2022 namespace NetPackageAnalyzerMetricsMSFT; public enum eMSFTMetrics diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerMetricsMSFT/Metric.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerMetricsMSFT/Metric.cs index 690b10e8..36325499 100644 --- a/src/NetPackageAnalyzer/NetPackageAnalyzerMetricsMSFT/Metric.cs +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerMetricsMSFT/Metric.cs @@ -1,6 +1,4 @@ -using System.ComponentModel.DataAnnotations; - -namespace NetPackageAnalyzerMetricsMSFT; +namespace NetPackageAnalyzerMetricsMSFT; public record Metric(eMSFTMetrics Name): IValidatableObject { diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerMetricsMSFT/globals.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerMetricsMSFT/globals.cs new file mode 100644 index 00000000..76913bba --- /dev/null +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerMetricsMSFT/globals.cs @@ -0,0 +1,2 @@ +global using System.ComponentModel.DataAnnotations; +global using System.Xml; diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/GenerateData.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/GenerateData.cs index 59f87d71..a73563e2 100644 --- a/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/GenerateData.cs +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/GenerateData.cs @@ -1,10 +1,4 @@ - - -using NetPackageAnalyzerDiagram; -using NetPackageAnalyzerMetricsMSFT; -using System.Diagnostics; - -namespace NetPackageAnalyzerObjects; +namespace NetPackageAnalyzerObjects; public class GenerateData { public GenerateData(IFileSystem system) diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/ProcessOutput.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/ProcessOutput.cs index cd9e7818..99440dcc 100644 --- a/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/ProcessOutput.cs +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/ProcessOutput.cs @@ -1,5 +1,4 @@ -using System.Diagnostics; - + namespace NetPackageAnalyzerObjects; public class ProcessOutput { diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/ProjectData.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/ProjectData.cs index 2d019b00..d08a971a 100644 --- a/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/ProjectData.cs +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/ProjectData.cs @@ -1,7 +1,4 @@ -using NetPackageAnalyzeHistory; -using System.ComponentModel; - -namespace NetPackageAnalyzerObjects; +namespace NetPackageAnalyzerObjects; public partial record ProjectData(string PathProject, string folderSolution) { diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/globals.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/globals.cs index 82a2cdcc..c9f74577 100644 --- a/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/globals.cs +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerObjects/globals.cs @@ -15,7 +15,10 @@ global using NuGetInfo; global using NetPackageAnalyzeHistory; global using Statistical; -using NPA.GitInfo; +global using NPA.GitInfo; +global using NetPackageAnalyzerDiagram; +global using System.Diagnostics; +global using System.ComponentModel; public static class GlobalsForGenerating { diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerShowInConsole/WriteToConsole.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerShowInConsole/WriteToConsole.cs index 5fa95b6c..6d747e4c 100644 --- a/src/NetPackageAnalyzer/NetPackageAnalyzerShowInConsole/WriteToConsole.cs +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerShowInConsole/WriteToConsole.cs @@ -1,7 +1,4 @@ -using Spectre.Console; -using Spectre.Console.Rendering; - -namespace NetPackageAnalyzerShowInConsole; +namespace NetPackageAnalyzerShowInConsole; public class WriteToConsole(GenerateData generatorData) { diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerShowInConsole/globals.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerShowInConsole/globals.cs index 65765f62..f195fce1 100644 --- a/src/NetPackageAnalyzer/NetPackageAnalyzerShowInConsole/globals.cs +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerShowInConsole/globals.cs @@ -1 +1,3 @@ -global using NetPackageAnalyzerObjects; \ No newline at end of file +global using NetPackageAnalyzerObjects; +global using Spectre.Console; +global using Spectre.Console.Rendering; diff --git a/src/NetPackageAnalyzer/NetPackageAnalyzerWork/GenerateFilesDocusaurus.cs b/src/NetPackageAnalyzer/NetPackageAnalyzerWork/GenerateFilesDocusaurus.cs index 3ba75ff3..d04ed011 100644 --- a/src/NetPackageAnalyzer/NetPackageAnalyzerWork/GenerateFilesDocusaurus.cs +++ b/src/NetPackageAnalyzer/NetPackageAnalyzerWork/GenerateFilesDocusaurus.cs @@ -1,6 +1,4 @@ -using NetPackageAnalyzerObjects; - -namespace NetPackageAnalyzerDocusaurus; +namespace NetPackageAnalyzerDocusaurus;