Fixup most warnings/info items

GrahamTheCoder · GrahamTheCoder · commit 1fd59bb6ad40 · 2020-04-19T17:11:16.000+01:00
diff --git a/CodeConverter/Shared/NameGenerator.cs b/CodeConverter/Shared/NameGenerator.cs
@@ -67,7 +67,7 @@ private static void EnsureUniquenessInPlace(
             Func<string, bool> canUse,
             bool isCaseSensitive = true)
         {
-            canUse = canUse ?? (s => true);
+            canUse ??= (s => true);
 
             // Don't enumerate as we will be modifying the collection in place.
             for (var i = 0; i < names.Count; i++) {
diff --git a/CodeConverter/Shared/ProjectConversion.cs b/CodeConverter/Shared/ProjectConversion.cs
@@ -40,7 +40,7 @@ private ProjectConversion(IProjectContentsConverter projectContentsConverter, IE
 
         public static async Task<ConversionResult> ConvertText<TLanguageConversion>(string text, TextConversionOptions conversionOptions, IProgress<ConversionProgress> progress = null, CancellationToken cancellationToken = default) where TLanguageConversion : ILanguageConversion, new()
         {
-            progress = progress ?? new Progress<ConversionProgress>();
+            progress ??= new Progress<ConversionProgress>();
             using var roslynEntryPoint = await RoslynEntryPoint(progress);
 
             var languageConversion = new TLanguageConversion { ConversionOptions = conversionOptions };
@@ -52,7 +52,7 @@ private ProjectConversion(IProjectContentsConverter projectContentsConverter, IE
 
         public static async Task<ConversionResult> ConvertSingle<TLanguageConversion>(Document document, SingleConversionOptions conversionOptions, IProgress<ConversionProgress> progress = null, CancellationToken cancellationToken = default) where TLanguageConversion : ILanguageConversion, new()
         {
-            progress = progress ?? new Progress<ConversionProgress>();
+            progress ??= new Progress<ConversionProgress>();
             using var roslynEntryPoint = await RoslynEntryPoint(progress);
 
             var languageConversion = new TLanguageConversion { ConversionOptions = conversionOptions };
@@ -68,10 +68,10 @@ private ProjectConversion(IProjectContentsConverter projectContentsConverter, IE
 
             var conversion = new ProjectConversion(projectContentsConverter, new[] { document }, Enumerable.Empty<TextDocument>(), languageConversion, cancellationToken, conversionOptions.ShowCompilationErrors, returnSelectedNode);
             var conversionResults = await conversion.Convert(progress).ToArrayAsync();
-            return GetSingleResultForDocument(conversionResults, document, progress);
+            return GetSingleResultForDocument(conversionResults, document);
         }
 
-        private static ConversionResult GetSingleResultForDocument(ConversionResult[] conversionResults, Document document, IProgress<ConversionProgress> progress)
+        private static ConversionResult GetSingleResultForDocument(ConversionResult[] conversionResults, Document document)
         {
             var codeResult = conversionResults.First(r => r.SourcePathOrNull == document.FilePath);
             codeResult.Exceptions = conversionResults.SelectMany(x => x.Exceptions).ToArray();
@@ -82,7 +82,7 @@ public static async IAsyncEnumerable<ConversionResult> ConvertProject(Project pr
             ILanguageConversion languageConversion, IProgress<ConversionProgress> progress, [EnumeratorCancellation] CancellationToken cancellationToken,
             params (string Find, string Replace, bool FirstOnly)[] replacements)
         {
-            progress = progress ?? new Progress<ConversionProgress>();
+            progress ??= new Progress<ConversionProgress>();
             using var roslynEntryPoint = await RoslynEntryPoint(progress);
 
             var projectContentsConverter = await languageConversion.CreateProjectContentsConverter(project, progress, cancellationToken);
diff --git a/CodeConverter/Shared/TextReplacementConverter.cs b/CodeConverter/Shared/TextReplacementConverter.cs
@@ -9,7 +9,7 @@ internal static class TextReplacementConverter
     {
         public static ConversionResult ConversionResultFromReplacements(this FileInfo filePath, IEnumerable<(string Find, string Replace, bool FirstOnly)> replacements, Func<string, string> postReplacementTransform = null)
         {
-            postReplacementTransform = postReplacementTransform ?? (s => s);
+            postReplacementTransform ??= (s => s);
             var newProjectText = File.ReadAllText(filePath.FullName);
             newProjectText = newProjectText.Replace(replacements);
             string withReplacements = postReplacementTransform(newProjectText);
diff --git a/CodeConverter/Util/FromRoslyn/SpecializedCollections.cs b/CodeConverter/Util/FromRoslyn/SpecializedCollections.cs
@@ -91,7 +91,7 @@ public static ISet<T> ReadOnlySet<T>(IEnumerable<T> values)
 
             HashSet<T> result = null;
             foreach (var item in values) {
-                result = result ?? new HashSet<T>();
+                result ??= new HashSet<T>();
                 result.Add(item);
             }
 
diff --git a/CodeConverter/Util/ISymbolExtensions.cs b/CodeConverter/Util/ISymbolExtensions.cs
@@ -23,7 +23,7 @@ public static bool IsDefinedInSource(this ISymbol symbol)
 
         public static TSymbol ExtractBestMatch<TSymbol>(this SymbolInfo info, Func<TSymbol, bool> isMatch = null) where TSymbol : class, ISymbol
         {
-            isMatch = isMatch ?? (_ => true);
+            isMatch ??= (_ => true);
             if (info.Symbol == null && info.CandidateSymbols.Length == 0)
                 return null;
             if (info.Symbol != null)
diff --git a/CodeConverter/Util/SyntaxNodeExtensions.cs b/CodeConverter/Util/SyntaxNodeExtensions.cs
@@ -339,7 +339,7 @@ public static T WithConvertedTrailingTriviaFrom<T>(this T node, SyntaxToken from
 
         public static SyntaxToken WithConvertedTrailingTriviaFrom(this SyntaxToken node, SyntaxToken? otherToken, TriviaKinds triviaKinds = null)
         {
-            triviaKinds = triviaKinds ?? TriviaKinds.All;
+            triviaKinds ??= TriviaKinds.All;
             if (!otherToken.HasValue || !otherToken.Value.HasTrailingTrivia) return node;
             var convertedTrivia = ConvertTrivia(otherToken.Value.TrailingTrivia.Where(triviaKinds.ShouldAccept).ToArray());
             return node.WithTrailingTrivia(node.ImportantTrailingTrivia().Concat(convertedTrivia));
diff --git a/CodeConverter/Util/TypeExtensions.cs b/CodeConverter/Util/TypeExtensions.cs
@@ -92,7 +92,7 @@ public static string GetFullMetadataName(this INamedTypeSymbol symbol)
 
         public static string GetFullMetadataName(this INamespaceSymbol ns, StringBuilder sb = null)
         {
-            sb = sb ?? new StringBuilder();
+            sb ??= new StringBuilder();
             while (ns != null && !ns.IsGlobalNamespace) {
                 if (sb.Length > 0) sb.Insert(0, '.');
                 sb.Insert(0, ns.MetadataName);
diff --git a/CommandLine/CodeConv.Shared/CodeConvProgram.cs b/CommandLine/CodeConv.Shared/CodeConvProgram.cs
@@ -33,7 +33,7 @@ public partial class CodeConvProgram
         /// <remarks>Calls <see cref="OnExecuteAsync(CommandLineApplication)"/> by reflection</remarks>
         public static async Task<int> Main(string[] args) => await CommandLineApplication.ExecuteAsync<CodeConvProgram>(args);
         /// <remarks>Used by reflection in CommandLineApplication.ExecuteAsync</remarks>
-        private async Task<int> OnExecuteAsync(CommandLineApplication app) => await ExecuteAsync();
+        private async Task<int> OnExecuteAsync(CommandLineApplication _) => await ExecuteAsync();
 
         [FileExists]
         [Required]
@@ -88,8 +88,8 @@ private async Task<int> ExecuteAsync()
 
                 if (!(ex is ValidationException)) {
                     await Console.Error.WriteLineAsync(Environment.NewLine + ex.GetType() + ex.StackTrace);
-                    if (ex is ReflectionTypeLoadException rtle) {
-                        foreach (var e in rtle.LoaderExceptions) {
+                    if (ex is ReflectionTypeLoadException rtle && rtle.LoaderExceptions is IEnumerable<Exception> loaderExceptions) {
+                        foreach (var e in loaderExceptions) {
                             await Console.Error.WriteLineAsync(e.Message);
                         }
                     }
@@ -168,7 +168,7 @@ private bool ShouldIncludeProject(Project project)
             var vsWhereExe = Environment.ExpandEnvironmentVariables(@"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe");
             var args = new[] { "-latest", "-prerelease", "-products", "*", "-requires", "Microsoft.Component.MSBuild", "-version", "[16.0,]", "-find", @"MSBuild\**\Bin\MSBuild.exe" };
             
-            var (exitCode, stdOut, stdErr) = await new ProcessStartInfo(vsWhereExe) {
+            var (exitCode, stdOut, _) = await new ProcessStartInfo(vsWhereExe) {
                 Arguments = ArgumentEscaper.EscapeAndConcatenate(args)
             }.GetOutputAsync();
 
diff --git a/CommandLine/CodeConv.Shared/ConversionResultWriter.cs b/CommandLine/CodeConv.Shared/ConversionResultWriter.cs
@@ -11,7 +11,7 @@ namespace ICSharpCode.CodeConverter.CommandLine
 {
     public static class ConversionResultWriter
     {
-        private static string[] FileSystemNamesToIgnore = new[] { ".git", ".gitattributes", ".gitignore", "bin", "obj", ".vs" };
+        private static readonly string[] FileSystemNamesToIgnore = new[] { ".git", ".gitattributes", ".gitignore", "bin", "obj", ".vs" };
 
         public static async Task WriteConvertedAsync(IAsyncEnumerable<ConversionResult> conversionResultsEnumerable, string solutionFilePath, DirectoryInfo targetDirectory, bool wipeTargetDirectory, bool copyOriginalDirectory, IProgress<string> progress, CancellationToken cancellationToken)
         {
diff --git a/CommandLine/CodeConv.Shared/Util/AppDomainExtensions.cs b/CommandLine/CodeConv.Shared/Util/AppDomainExtensions.cs
@@ -7,10 +7,11 @@ internal static class AppDomainExtensions
     {
         public static void UseVersionAgnosticAssemblyResolution(this AppDomain appDomain) => appDomain.AssemblyResolve += LoadAnyVersion;
 
-        private static Assembly? LoadAnyVersion(object sender, ResolveEventArgs args)
+        private static Assembly? LoadAnyVersion(object? sender, ResolveEventArgs? args)
         {
+            if (args?.Name == null) return null;
             var requestedAssemblyName = new AssemblyName(args.Name);
-            if (requestedAssemblyName.Version != null) {
+            if (requestedAssemblyName.Version != null && requestedAssemblyName.Name != null) {
                 try {
                     return Assembly.Load(new AssemblyName(requestedAssemblyName.Name) { CultureName = requestedAssemblyName.CultureName });
                 } catch (Exception) {
diff --git a/CommandLine/CodeConv.Shared/Util/EnumerableExtensions.cs b/CommandLine/CodeConv.Shared/Util/EnumerableExtensions.cs
@@ -7,17 +7,17 @@ namespace ICSharpCode.CodeConverter.CommandLine.Util
 {
     internal static class EnumerableExtensions
     {
-        public static Dictionary<TKey, TElement> ToDictionary<TKey, TElement>(this IEnumerable<IGrouping<TKey, TElement>> lookup)
+        public static Dictionary<TKey, TElement> ToDictionary<TKey, TElement>(this IEnumerable<IGrouping<TKey, TElement>> lookup) where TKey: notnull
         {
             var duplicateProps = lookup.Where(p => p.Count() > 1).Select(p => p.Key).ToArray();
             if (duplicateProps.Any()) throw new ValidationException($"Duplicate keys for: {string.Join(", ", duplicateProps)}");
             return lookup.ToDictionary(p => p.Key, p => p.First());
         }
 
-        public static bool TryAdd<TKey, TElement>(this IDictionary<TKey, TElement> lookup, TKey key, TElement element)
+        public static bool TryAdd<TKey, TElement>(this IDictionary<TKey, TElement> dictionary, TKey key, TElement element) where TKey : notnull
         {
-            if (lookup.ContainsKey(key)) return false;
-            lookup[key] = element;
+            if (dictionary.ContainsKey(key)) return false;
+            dictionary[key] = element;
             return true;
         }
 
diff --git a/CommandLine/CodeConv/CodeConv.csproj b/CommandLine/CodeConv/CodeConv.csproj
@@ -24,6 +24,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
+    <NoWarn>NU5100</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -42,6 +43,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.6.13" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
     <PackageReference Include="NuGet.Build.Tasks" Version="5.4.0" />
+    <PackageReference Include="System.CodeDom" Version="4.7.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
diff --git a/Tests/GlobalSuppressions.cs b/Tests/GlobalSuppressions.cs
@@ -0,0 +1,8 @@
+﻿// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Usage", "VSTHRD012:Provide JoinableTaskFactory where allowed", Justification = "I don't have or want a reference to VS Shell", Scope = "member", Target = "~M:ICSharpCode.CodeConverter.Tests.TestRunners.SelfVerifyingTestFactory.GetSelfVerifyingFacts``2(System.String,System.Collections.Generic.List{ICSharpCode.CodeConverter.Tests.TestRunners.NamedFact})~System.Collections.Generic.IEnumerable{ICSharpCode.CodeConverter.Tests.TestRunners.NamedFact}")]
diff --git a/Tests/TestRunners/MultiFileTestFixture.cs b/Tests/TestRunners/MultiFileTestFixture.cs
@@ -132,10 +132,9 @@ private Encoding GetEncoding(ConversionResult conversionResult)
 
         private static Encoding GetEncoding(string filePath)
         {
-            using (var reader = new StreamReader(filePath, true)) {
-                reader.Peek();
-                return reader.CurrentEncoding;
-            }
+            using var reader = new StreamReader(filePath, true);
+            reader.Peek();
+            return reader.CurrentEncoding;
         }
 
         private static DirectoryInfo GetExpectedResultDirectory(string testFolderName, Language targetLanguage)

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ private static void EnsureUniquenessInPlace(`
`67`	`67`	`Func<string, bool> canUse,`
`68`	`68`	`bool isCaseSensitive = true)`
`69`	`69`	`{`
`70`		`- canUse = canUse ?? (s => true);`
	`70`	`+ canUse ??= (s => true);`
`71`	`71`
`72`	`72`	`// Don't enumerate as we will be modifying the collection in place.`
`73`	`73`	`for (var i = 0; i < names.Count; i++) {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ internal static class TextReplacementConverter`
`9`	`9`	`{`
`10`	`10`	`public static ConversionResult ConversionResultFromReplacements(this FileInfo filePath, IEnumerable<(string Find, string Replace, bool FirstOnly)> replacements, Func<string, string> postReplacementTransform = null)`
`11`	`11`	`{`
`12`		`- postReplacementTransform = postReplacementTransform ?? (s => s);`
	`12`	`+ postReplacementTransform ??= (s => s);`
`13`	`13`	`var newProjectText = File.ReadAllText(filePath.FullName);`
`14`	`14`	`newProjectText = newProjectText.Replace(replacements);`
`15`	`15`	`string withReplacements = postReplacementTransform(newProjectText);`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public static ISet<T> ReadOnlySet<T>(IEnumerable<T> values)`
`91`	`91`
`92`	`92`	`HashSet<T> result = null;`
`93`	`93`	`foreach (var item in values) {`
`94`		`- result = result ?? new HashSet<T>();`
	`94`	`+ result ??= new HashSet<T>();`
`95`	`95`	`result.Add(item);`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public static bool IsDefinedInSource(this ISymbol symbol)`
`23`	`23`
`24`	`24`	`public static TSymbol ExtractBestMatch<TSymbol>(this SymbolInfo info, Func<TSymbol, bool> isMatch = null) where TSymbol : class, ISymbol`
`25`	`25`	`{`
`26`		`- isMatch = isMatch ?? (_ => true);`
	`26`	`+ isMatch ??= (_ => true);`
`27`	`27`	`if (info.Symbol == null && info.CandidateSymbols.Length == 0)`
`28`	`28`	`return null;`
`29`	`29`	`if (info.Symbol != null)`
Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ public static T WithConvertedTrailingTriviaFrom<T>(this T node, SyntaxToken from`
`339`	`339`
`340`	`340`	`public static SyntaxToken WithConvertedTrailingTriviaFrom(this SyntaxToken node, SyntaxToken? otherToken, TriviaKinds triviaKinds = null)`
`341`	`341`	`{`
`342`		`- triviaKinds = triviaKinds ?? TriviaKinds.All;`
	`342`	`+ triviaKinds ??= TriviaKinds.All;`
`343`	`343`	`if (!otherToken.HasValue \|\| !otherToken.Value.HasTrailingTrivia) return node;`
`344`	`344`	`var convertedTrivia = ConvertTrivia(otherToken.Value.TrailingTrivia.Where(triviaKinds.ShouldAccept).ToArray());`
`345`	`345`	`return node.WithTrailingTrivia(node.ImportantTrailingTrivia().Concat(convertedTrivia));`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public static string GetFullMetadataName(this INamedTypeSymbol symbol)`
`92`	`92`
`93`	`93`	`public static string GetFullMetadataName(this INamespaceSymbol ns, StringBuilder sb = null)`
`94`	`94`	`{`
`95`		`- sb = sb ?? new StringBuilder();`
	`95`	`+ sb ??= new StringBuilder();`
`96`	`96`	`while (ns != null && !ns.IsGlobalNamespace) {`
`97`	`97`	`if (sb.Length > 0) sb.Insert(0, '.');`
`98`	`98`	`sb.Insert(0, ns.MetadataName);`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace ICSharpCode.CodeConverter.CommandLine`
`11`	`11`	`{`
`12`	`12`	`public static class ConversionResultWriter`
`13`	`13`	`{`
`14`		`- private static string[] FileSystemNamesToIgnore = new[] { ".git", ".gitattributes", ".gitignore", "bin", "obj", ".vs" };`
	`14`	`+ private static readonly string[] FileSystemNamesToIgnore = new[] { ".git", ".gitattributes", ".gitignore", "bin", "obj", ".vs" };`
`15`	`15`
`16`	`16`	`public static async Task WriteConvertedAsync(IAsyncEnumerable<ConversionResult> conversionResultsEnumerable, string solutionFilePath, DirectoryInfo targetDirectory, bool wipeTargetDirectory, bool copyOriginalDirectory, IProgress<string> progress, CancellationToken cancellationToken)`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,11 @@ internal static class AppDomainExtensions`
`7`	`7`	`{`
`8`	`8`	`public static void UseVersionAgnosticAssemblyResolution(this AppDomain appDomain) => appDomain.AssemblyResolve += LoadAnyVersion;`
`9`	`9`
`10`		`- private static Assembly? LoadAnyVersion(object sender, ResolveEventArgs args)`
	`10`	`+ private static Assembly? LoadAnyVersion(object? sender, ResolveEventArgs? args)`
`11`	`11`	`{`
	`12`	`+ if (args?.Name == null) return null;`
`12`	`13`	`var requestedAssemblyName = new AssemblyName(args.Name);`
`13`		`- if (requestedAssemblyName.Version != null) {`
	`14`	`+ if (requestedAssemblyName.Version != null && requestedAssemblyName.Name != null) {`
`14`	`15`	`try {`
`15`	`16`	`return Assembly.Load(new AssemblyName(requestedAssemblyName.Name) { CultureName = requestedAssemblyName.CultureName });`
`16`	`17`	`} catch (Exception) {`