Update StyleCop, add editorconfig

Directory.Build.props

@@ -1,12 +1,35 @@
 <Project>
   <PropertyGroup>
-    <DefaultItemExcludes>*log</DefaultItemExcludes>
-    <Deterministic>true</Deterministic>
-    <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
+    <!-- Use the latest version of C# available -->
     <LangVersion>Latest</LangVersion>
+
+    <!-- Don't allow warnings -->
     <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
-    <NoWarn>$(NoWarn);SA0001</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+
+    <!-- Enabled the built-in analyzers -->
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <AnalysisMode>All</AnalysisMode>
+
+    <!-- Use Directory.Packages.props to manage versions -->
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+
+    <DefaultItemExcludes>*log</DefaultItemExcludes>
+    <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
+
+    <!-- Required for IDE0005 -->
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+
+    <!--<NoWarn>$(NoWarn);SA0001</NoWarn>-->
     <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
     <UseArtifactsOutput>true</UseArtifactsOutput>
+    <Deterministic>true</Deterministic>
   </PropertyGroup>
+
+  <!-- StyleCop-->
+  <ItemGroup>
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Visible="false" />
+  </ItemGroup>
 </Project>

Directory.Packages.props

@@ -1,7 +1,4 @@
 <Project>
-  <PropertyGroup>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-  </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="Microsoft.Build" Version="17.10.4" />
@@ -19,10 +16,6 @@
   </ItemGroup>
   <ItemGroup>
     <GlobalPackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(EnableStyleCopAnalyzers)' != 'false'">
-    <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
-    <Compile Include="$(MSBuildThisFileDirectory)src\GlobalSuppressions.cs" />
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Visible="false" />
+    <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
   </ItemGroup>
 </Project>

PackagesConfigConverter.sln

@@ -9,6 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackagesConfigConverter.Uni
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{724AF5A0-8E73-4CE7-A613-2C0FE768AB6A}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.rsp = Directory.Build.rsp

src/PackagesConfigConverter.UnitTests/E2ETests.cs

@@ -2,7 +2,6 @@
 //
 // Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -120,4 +119,4 @@ public void E2ETest(string testCase)
             Assert.Equal(expectedProjectContent, actualProjectContent);
         }
     }
-}
+}

src/PackagesConfigConverter.UnitTests/XUnitLogger.cs

@@ -2,8 +2,8 @@
 //
 // Licensed under the MIT license.
 
-using Microsoft.Extensions.Logging;
 using System;
+using Microsoft.Extensions.Logging;
 using Xunit.Abstractions;
 
 namespace PackagesConfigConverter.UnitTests
@@ -25,4 +25,4 @@ public IDisposable BeginScope<TState>(TState state)
         public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
             => _testOutputHelper.WriteLine(formatter(state, exception));
     }
-}
+}

src/PackagesConfigConverter/AnalyzerRegularExpressions.cs

@@ -2,8 +2,8 @@
 //
 // Licensed under the MIT license.
 
-using NuGet.Packaging.Core;
 using System.Text.RegularExpressions;
+using NuGet.Packaging.Core;
 
 namespace PackagesConfigConverter
 {

src/PackagesConfigConverter/AssemblyReferenceRegularExpressions.cs

@@ -2,8 +2,8 @@
 //
 // Licensed under the MIT license.
 
-using NuGet.Packaging.Core;
 using System.Text.RegularExpressions;
+using NuGet.Packaging.Core;
 
 namespace PackagesConfigConverter
 {

src/PackagesConfigConverter/ElementPath.cs

@@ -2,8 +2,8 @@
 //
 // Licensed under the MIT license.
 
-using Microsoft.Build.Construction;
 using System;
+using Microsoft.Build.Construction;
 
 namespace PackagesConfigConverter
 {

src/PackagesConfigConverter/ExtensionMethods.cs

@@ -2,14 +2,14 @@
 //
 // Licensed under the MIT license.
 
-using Microsoft.Build.Construction;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Xml;
+using Microsoft.Build.Construction;
 
 namespace PackagesConfigConverter
 {

src/PackagesConfigConverter/ImportRegularExpressions.cs

@@ -2,8 +2,8 @@
 //
 // Licensed under the MIT license.
 
-using NuGet.Packaging.Core;
 using System.Text.RegularExpressions;
+using NuGet.Packaging.Core;
 
 namespace PackagesConfigConverter
 {

src/PackagesConfigConverter/PackageInfo.cs

@@ -2,12 +2,12 @@
 //
 // Licensed under the MIT license.
 
-using NuGet.Packaging;
-using NuGet.Packaging.Core;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using NuGet.Packaging;
+using NuGet.Packaging.Core;
 
 namespace PackagesConfigConverter
 {
@@ -75,4 +75,4 @@ static bool HasAnyRealFiles(string dir)
             }
         }
     }
-}
+}

src/PackagesConfigConverter/PackageInfoFactory.cs

@@ -2,17 +2,17 @@
 //
 // Licensed under the MIT license.
 
+using System.Collections.Concurrent;
 using NuGet.Packaging;
 using NuGet.Packaging.Core;
-using System.Collections.Concurrent;
 
 namespace PackagesConfigConverter
 {
     internal sealed class PackageInfoFactory
     {
         private readonly PackagePathResolver _packagePathResolver;
         private readonly VersionFolderPathResolver _versionFolderPathResolver;
-        private readonly ConcurrentDictionary<PackageIdentity, PackageInfo> _packages = new ();
+        private readonly ConcurrentDictionary<PackageIdentity, PackageInfo> _packages = new();
 
         public PackageInfoFactory(PackagePathResolver packagePathResolver, VersionFolderPathResolver versionFolderPathResolver)
         {
@@ -22,4 +22,4 @@ public PackageInfoFactory(PackagePathResolver packagePathResolver, VersionFolder
 
         public PackageInfo GetPackageInfo(PackageIdentity identity) => _packages.GetOrAdd(identity, id => new PackageInfo(id, _packagePathResolver, _versionFolderPathResolver));
     }
-}
+}

src/PackagesConfigConverter/PackageUsage.cs

@@ -2,18 +2,17 @@
 //
 // Licensed under the MIT license.
 
+using System.Collections.Generic;
+using System.Linq;
 using CommandLine;
 using Microsoft.Build.Construction;
-using NuGet.Packaging.Core;
 using NuGet.Versioning;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace PackagesConfigConverter
 {
     internal sealed class PackageUsage
     {
-        public PackageUsage(PackageIdentity identity, PackageInfo packageInfo, bool isDevelopmentDependency)
+        public PackageUsage(PackageInfo packageInfo, bool isDevelopmentDependency)
         {
             PackageInfo = packageInfo;
             IsDevelopmentDependency = isDevelopmentDependency;
@@ -25,11 +24,11 @@ public PackageUsage(PackageIdentity identity, PackageInfo packageInfo, bool isDe
 
         public IEnumerable<ProjectElement> AllElements => AnalyzerItems.Cast<ProjectElement>().Concat(AssemblyReferences).Concat(Imports);
 
-        public List<ProjectItemElement> AnalyzerItems { get; } = new ();
+        public List<ProjectItemElement> AnalyzerItems { get; } = new();
 
-        public List<ProjectItemElement> AssemblyReferences { get; } = new ();
+        public List<ProjectItemElement> AssemblyReferences { get; } = new();
 
-        public List<ProjectImportElement> Imports { get; } = new ();
+        public List<ProjectImportElement> Imports { get; } = new();
 
         public bool GeneratePathProperty { get; set; }
 
@@ -39,4 +38,4 @@ public PackageUsage(PackageIdentity identity, PackageInfo packageInfo, bool isDe
 
         public NuGetVersion PackageVersion => PackageInfo.Identity.Version;
     }
-}
+}

src/PackagesConfigConverter/Program.cs

@@ -2,15 +2,14 @@
 //
 // Licensed under the MIT license.
 
-using CommandLine;
-using Microsoft.Extensions.Logging;
-using Serilog;
-using Serilog.Events;
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
-
+using CommandLine;
+using Microsoft.Extensions.Logging;
+using Serilog;
+using Serilog.Events;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace PackagesConfigConverter
@@ -79,7 +78,7 @@ public static void Run(ProgramArguments arguments)
             if (!arguments.Yes)
             {
                 Console.Write("Ensure there are no files checked out in git before continuing!  Continue? (Y/N) ");
-                if (!Console.In.ReadLine() !.StartsWith("Y", StringComparison.OrdinalIgnoreCase))
+                if (!Console.In.ReadLine()!.StartsWith("Y", StringComparison.OrdinalIgnoreCase))
                 {
                     throw new OperationCanceledException();
                 }

src/PackagesConfigConverter/ProjectConverter.cs

@@ -2,6 +2,13 @@
 //
 // Licensed under the MIT license.
 
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Xml.Linq;
 using Microsoft.Build.Construction;
 using Microsoft.Build.Evaluation;
 using Microsoft.Extensions.Logging;
@@ -17,28 +24,20 @@
 using NuGet.Protocol;
 using NuGet.Protocol.Core.Types;
 using NuGet.Versioning;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Xml.Linq;
-
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 // ReSharper disable CollectionNeverUpdated.Local
 namespace PackagesConfigConverter
 {
     internal sealed class ProjectConverter : IProjectConverter
     {
-        private static readonly HashSet<string> ItemsToRemove = new (StringComparer.OrdinalIgnoreCase) { "packages.config" };
-        private static readonly HashSet<string> PropertiesToRemove = new (StringComparer.OrdinalIgnoreCase) { "NuGetPackageImportStamp" };
-        private static readonly HashSet<string> TargetsToRemove = new (StringComparer.OrdinalIgnoreCase) { "EnsureNuGetPackageBuildImports" };
+        private static readonly HashSet<string> ItemsToRemove = new(StringComparer.OrdinalIgnoreCase) { "packages.config" };
+        private static readonly HashSet<string> PropertiesToRemove = new(StringComparer.OrdinalIgnoreCase) { "NuGetPackageImportStamp" };
+        private static readonly HashSet<string> TargetsToRemove = new(StringComparer.OrdinalIgnoreCase) { "EnsureNuGetPackageBuildImports" };
         private readonly ProjectConverterSettings _converterSettings;
         private readonly string _globalPackagesFolder;
         private readonly ISettings _nugetSettings;
-        private readonly ProjectCollection _projectCollection = new ();
+        private readonly ProjectCollection _projectCollection = new();
         private readonly string _repositoryPath;
         private readonly PackageInfoFactory _packageInfoFactory;
         private readonly RestoreCommandProvidersCache _restoreCommandProvidersCache;
@@ -218,7 +217,7 @@ private bool ConvertProject(string projectPath, string packagesConfigPath)
                     .Select(i =>
                     {
                         PackageInfo packageInfo = _packageInfoFactory.GetPackageInfo(i.PackageIdentity);
-                        return new PackageUsage(i.PackageIdentity, packageInfo, i.IsDevelopmentDependency);
+                        return new PackageUsage(packageInfo, i.IsDevelopmentDependency);
                     })
                     .ToList();
 
@@ -311,7 +310,7 @@ private void DetectMissingTransitiveDependencies(List<PackageUsage> packages, st
 
                     PackageIdentity packageIdentity = new PackageIdentity(library.Name, library.Version);
                     PackageInfo packageInfo = _packageInfoFactory.GetPackageInfo(packageIdentity);
-                    PackageUsage missingTransitiveDependency = new PackageUsage(packageIdentity, packageInfo, isDevelopmentDependency: false);
+                    PackageUsage missingTransitiveDependency = new PackageUsage(packageInfo, isDevelopmentDependency: false);
                     missingTransitiveDependency.IsMissingTransitiveDependency = true;
                     packages.Add(missingTransitiveDependency);
                 }

src/PackagesConfigConverter/ProjectConverterSettings.cs

@@ -2,8 +2,8 @@
 //
 // Licensed under the MIT license.
 
-using Microsoft.Extensions.Logging;
 using System.Text.RegularExpressions;
+using Microsoft.Extensions.Logging;
 
 namespace PackagesConfigConverter
 {

src/PackagesConfigConverter/RegularExpressions.cs

@@ -6,10 +6,10 @@ namespace PackagesConfigConverter
 {
     internal static class RegularExpressions
     {
-        public static AnalyzerRegularExpressions Analyzers { get; } = new ();
+        public static AnalyzerRegularExpressions Analyzers { get; } = new();
 
-        public static AssemblyReferenceRegularExpressions AssemblyReferences { get; } = new ();
+        public static AssemblyReferenceRegularExpressions AssemblyReferences { get; } = new();
 
-        public static ImportRegularExpressions Imports { get; } = new ();
+        public static ImportRegularExpressions Imports { get; } = new();
     }
 }