Add IDE warnings to code analysis ruleset (#42566)

- Add all IDEXXXX warnings to ruleset, but as hidden for now - Enable IDE0073: file header mismatch
dotnet · Sep 24, 2020 · 3b6600c · 3b6600c
1 parent 547b201
commit 3b6600c
Show file tree

Hide file tree

Showing 107 changed files with 203 additions and 29 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -15,6 +15,10 @@ trim_trailing_whitespace = true
 [project.json]
 indent_size = 2
 
+# Generated code
+[*{_AssemblyInfo.cs,.notsupported.cs}]
+generated_code = true
+
 # C# files
 [*.cs]
 # New line preferences
@@ -158,7 +162,7 @@ dotnet_code_quality.ca1802.api_surface = private, internal
 dotnet_code_quality.ca2208.api_surface = public
 
 # License header
-file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.\n
+file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.
 
 # C++ Files
 [*.{cpp,h,in}]

diff --git a/eng/Analyzers.props b/eng/Analyzers.props
@@ -7,6 +7,7 @@
   <ItemGroup Condition="'$(RunAnalyzers)' != 'false'">
     <PackageReference Include="Microsoft.DotNet.CodeAnalysis" Version="$(MicrosoftDotNetCodeAnalysisVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.0-rc2.20460.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="3.8.0-4.20469.1" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.205" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/eng/CodeAnalysis.ruleset b/eng/CodeAnalysis.ruleset
@@ -379,6 +379,96 @@
     <Rule Id="SA1643" Action="None" /> <!-- Destructor summary documentation should begin with standard text -->
     <Rule Id="SA1649" Action="None" /> <!-- File name should match first type name -->
   </Rules>
+  <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.CodeStyle" RuleNamespace="Microsoft.CodeQuality.Analyzers">
+    <Rule Id="IDE0001" Action="Hidden" />  <!-- SimplifyNames -->
+    <Rule Id="IDE0002" Action="Hidden" />  <!-- SimplifyMemberAccess -->
+    <Rule Id="IDE0003" Action="Hidden" />  <!-- RemoveQualification -->
+    <Rule Id="IDE0004" Action="Hidden" />  <!-- RemoveUnnecessaryCast -->
+    <Rule Id="IDE0005" Action="Hidden" />  <!-- RemoveUnnecessaryImports -->
+    <Rule Id="IDE0006" Action="Hidden" />  <!-- IntellisenseBuildFailed -->
+    <Rule Id="IDE0007" Action="Hidden" />  <!-- UseImplicitType -->
+    <Rule Id="IDE0008" Action="Hidden" />  <!-- UseExplicitType -->
+    <Rule Id="IDE0009" Action="Hidden" />  <!-- AddQualification -->
+    <Rule Id="IDE0010" Action="Hidden" />  <!-- PopulateSwitchStatement -->
+    <Rule Id="IDE0011" Action="Hidden" />  <!-- AddBraces -->
+    <Rule Id="IDE0016" Action="Hidden" />  <!-- UseThrowExpression -->
+    <Rule Id="IDE0017" Action="Hidden" />  <!-- UseObjectInitializer -->
+    <Rule Id="IDE0018" Action="Hidden" />  <!-- InlineDeclaration -->
+    <Rule Id="IDE0019" Action="Hidden" />  <!-- InlineAsTypeCheck -->
+    <Rule Id="IDE0020" Action="Hidden" />  <!-- InlineIsTypeCheck -->
+    <Rule Id="IDE0021" Action="Hidden" />  <!-- UseExpressionBodyForConstructors -->
+    <Rule Id="IDE0022" Action="Hidden" />  <!-- UseExpressionBodyForMethods -->
+    <Rule Id="IDE0023" Action="Hidden" />  <!-- UseExpressionBodyForConversionOperators -->
+    <Rule Id="IDE0024" Action="Hidden" />  <!-- UseExpressionBodyForOperators -->
+    <Rule Id="IDE0025" Action="Hidden" />  <!-- UseExpressionBodyForProperties -->
+    <Rule Id="IDE0026" Action="Hidden" />  <!-- UseExpressionBodyForIndexers -->
+    <Rule Id="IDE0027" Action="Hidden" />  <!-- UseExpressionBodyForAccessors -->
+    <Rule Id="IDE0028" Action="Hidden" />  <!-- UseCollectionInitializer -->
+    <Rule Id="IDE0029" Action="Hidden" />  <!-- UseCoalesceExpression -->
+    <Rule Id="IDE0030" Action="Hidden" />  <!-- UseCoalesceExpressionForNullable -->
+    <Rule Id="IDE0031" Action="Hidden" />  <!-- UseNullPropagation -->
+    <Rule Id="IDE0032" Action="Hidden" />  <!-- UseAutoProperty -->
+    <Rule Id="IDE0033" Action="Hidden" />  <!-- UseExplicitTupleName -->
+    <Rule Id="IDE0034" Action="Hidden" />  <!-- UseDefaultLiteral -->
+    <Rule Id="IDE0035" Action="Hidden" />  <!-- RemoveUnreachableCode -->
+    <Rule Id="IDE0036" Action="Hidden" />  <!-- OrderModifiers -->
+    <Rule Id="IDE0037" Action="Hidden" />  <!-- UseInferredMemberName -->
+    <Rule Id="IDE0038" Action="Hidden" />  <!-- InlineIsTypeWithoutNameCheck -->
+    <Rule Id="IDE0039" Action="Hidden" />  <!-- UseLocalFunction -->
+    <Rule Id="IDE0040" Action="Hidden" />  <!-- AddAccessibilityModifiers -->
+    <Rule Id="IDE0041" Action="Hidden" />  <!-- UseIsNullCheck -->
+    <Rule Id="IDE0042" Action="Hidden" />  <!-- UseDeconstruction -->
+    <Rule Id="IDE0043" Action="Hidden" />  <!-- ValidateFormatString -->
+    <Rule Id="IDE0044" Action="Hidden" />  <!-- MakeFieldReadonly -->
+    <Rule Id="IDE0045" Action="Hidden" />  <!-- UseConditionalExpressionForAssignment -->
+    <Rule Id="IDE0046" Action="Hidden" />  <!-- UseConditionalExpressionForReturn -->
+    <Rule Id="IDE0047" Action="Hidden" />  <!-- RemoveUnnecessaryParentheses -->
+    <Rule Id="IDE0048" Action="Hidden" />  <!-- AddRequiredParentheses -->
+    <Rule Id="IDE0049" Action="Hidden" />  <!-- PreferBuiltInOrFrameworkType -->
+    <Rule Id="IDE0050" Action="Hidden" />  <!-- ConvertAnonymousTypeToTuple -->
+    <Rule Id="IDE0051" Action="Hidden" />  <!-- RemoveUnusedMembers -->
+    <Rule Id="IDE0052" Action="Hidden" />  <!-- RemoveUnreadMembers -->
+    <Rule Id="IDE0053" Action="Hidden" />  <!-- UseExpressionBodyForLambdaExpressions -->
+    <Rule Id="IDE0054" Action="Hidden" />  <!-- UseCompoundAssignment -->
+    <Rule Id="IDE0055" Action="Hidden" />  <!-- Formatting -->
+    <Rule Id="IDE0056" Action="Hidden" />  <!-- UseIndexOperator -->
+    <Rule Id="IDE0057" Action="Hidden" />  <!-- UseRangeOperator -->
+    <Rule Id="IDE0058" Action="Hidden" />  <!-- ExpressionValueIsUnused -->
+    <Rule Id="IDE0059" Action="Hidden" />  <!-- ValueAssignedIsUnused -->
+    <Rule Id="IDE0060" Action="Hidden" />  <!-- UnusedParameter -->
+    <Rule Id="IDE0061" Action="Hidden" />  <!-- UseExpressionBodyForLocalFunctions -->
+    <Rule Id="IDE0062" Action="Hidden" />  <!-- MakeLocalFunctionStatic -->
+    <Rule Id="IDE0063" Action="Hidden" />  <!-- UseSimpleUsingStatement -->
+    <Rule Id="IDE0064" Action="Hidden" />  <!-- MakeStructFieldsWritable -->
+    <Rule Id="IDE0065" Action="Hidden" />  <!-- MoveMisplacedUsingDirectives -->
+    <Rule Id="IDE0066" Action="Hidden" />  <!-- ConvertSwitchStatementToExpression -->
+    <Rule Id="IDE0067" Action="Hidden" />  <!-- DisposeObjectsBeforeLosingScope -->
+    <Rule Id="IDE0068" Action="Hidden" />  <!-- UseRecommendedDisposePattern -->
+    <Rule Id="IDE0069" Action="Hidden" />  <!-- DisposableFieldsShouldBeDisposed -->
+    <Rule Id="IDE0070" Action="Hidden" />  <!-- UseSystemHashCode -->
+    <Rule Id="IDE0071" Action="Hidden" />  <!-- SimplifyInterpolation -->
+    <Rule Id="IDE0072" Action="Hidden" />  <!-- PopulateSwitchExpression -->
+    <Rule Id="IDE0073" Action="Warning" /> <!-- FileHeaderMismatch -->
+    <Rule Id="IDE0074" Action="Hidden" />  <!-- UseCoalesceCompoundAssignment -->
+    <Rule Id="IDE0075" Action="Hidden" />  <!-- SimplifyConditionalExpression -->
+    <Rule Id="IDE0076" Action="Hidden" />  <!-- InvalidSuppressMessageAttribute -->
+    <Rule Id="IDE0077" Action="Hidden" />  <!-- LegacyFormatSuppressMessageAttribute -->
+    <Rule Id="IDE0078" Action="Hidden" />  <!-- UsePatternCombinators -->
+    <Rule Id="IDE0079" Action="Hidden" />  <!-- RemoveUnnecessarySuppression -->
+    <Rule Id="IDE0080" Action="Hidden" />  <!-- RemoveConfusingSuppressionForIsExpression -->
+    <Rule Id="IDE0081" Action="Hidden" />  <!-- RemoveUnnecessaryByVal -->
+    <Rule Id="IDE0082" Action="Hidden" />  <!-- ConvertTypeOfToNameOf -->
+    <Rule Id="IDE0083" Action="Hidden" />  <!-- UseNotPattern -->
+    <Rule Id="IDE0084" Action="Hidden" />  <!-- UseIsNotExpression -->
+    <Rule Id="IDE1001" Action="Hidden" />  <!-- AnalyzerChanged -->
+    <Rule Id="IDE1002" Action="Hidden" />  <!-- AnalyzerDependencyConflict -->
+    <Rule Id="IDE1003" Action="Hidden" />  <!-- MissingAnalyzerReference -->
+    <Rule Id="IDE1004" Action="Hidden" />  <!-- ErrorReadingRuleset -->
+    <Rule Id="IDE1005" Action="Hidden" />  <!-- InvokeDelegateWithConditionalAccess -->
+    <Rule Id="IDE1006" Action="Hidden" />  <!-- NamingRule -->
+    <Rule Id="IDE1007" Action="Hidden" />  <!-- UnboundIdentifier -->
+    <Rule Id="IDE1008" Action="Hidden" />  <!-- UnboundConstructor -->
+  </Rules>
   <Rules AnalyzerId="xunit.analyzers" RuleNamespace="xunit.analyzers">
     <Rule Id="xUnit2013" Action="None" /> <!-- Do not use equality check to check for collection size. -->
     <Rule Id="xUnit2017" Action="None" /> <!-- Do not use Contains() to check if a value exists in a collection -->

diff --git a/src/coreclr/src/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComActivator.cs b/src/coreclr/src/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComActivator.cs
@@ -219,7 +219,7 @@ public static void ClassRegistrationScenarioForType(ComActivationContext cxt, bo
                     if (methParams[0].ParameterType == typeof(string))
                     {
                         // We are dealing with the string overload of the function - provide the registry key - see comhost.dll implementation
-                        objs[0] = $"HKEY_LOCAL_MACHINE\\SOFTWARE\\Classes\\CLSID\\{cxt.ClassId.ToString("B")}";
+                        objs[0] = $"HKEY_LOCAL_MACHINE\\SOFTWARE\\Classes\\CLSID\\{cxt.ClassId:B}";
                     }
                     else
                     {

diff --git a/src/installer/managed/Microsoft.NET.HostModel/ResourceUpdater.cs b/src/installer/managed/Microsoft.NET.HostModel/ResourceUpdater.cs
@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
 using System.Diagnostics;

diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateThisAssemblyCs.targets b/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateThisAssemblyCs.targets
@@ -7,6 +7,9 @@
           BeforeTargets="CoreCompile">
     <PropertyGroup>
       <ThisAssemblyCsContents>
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
 using System%3B
 namespace Microsoft.XmlSerializer.Generator
 {

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Bitmap.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Bitmap.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.Bitmap.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/BufferedGraphics.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/BufferedGraphics.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/BufferedGraphicsContext.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/BufferedGraphicsContext.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/BufferedGraphicsManager.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/BufferedGraphicsManager.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPath.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPath.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.Drawing2D.GraphicsPath.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Font.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Font.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.Fonts.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/GdiPlusStreamHelper.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/GdiPlusStreamHelper.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.GdiPlusStreamHelper.cs
 //   - Originally in System.Drawing.gdipFunctions.cs

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.Graphics.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.Icon.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Image.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Image.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.Image.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/ImageAnimator.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/ImageAnimator.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.ImageAnimator.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/BitmapData.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/BitmapData.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.Imaging.BitmapData.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/MetaHeader.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/MetaHeader.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.Imaging.MetaHeader.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.Imaging.Metafile.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/MetafileHeader.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/MetafileHeader.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.Imaging.MetafileHeader.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/MarshallingHelpers.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/MarshallingHelpers.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // Authors:
 //    Alexandre Pigolkine ([email protected])

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/NativeStructs.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/NativeStructs.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.NativeStructs.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PageSettings.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PageSettings.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.PageSettings.cs
 //

diff --git a/...ibraries/System.Drawing.Common/src/System/Drawing/Printing/PreviewPrintController.Unix.cs b/...ibraries/System.Drawing.Common/src/System/Drawing/Printing/PreviewPrintController.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.PreviewPrintController.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintController.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintController.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.PrintController.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.PrintDocument.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintEventArgs.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintEventArgs.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.PrintEventArgs.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintPageEventArgs.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintPageEventArgs.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.PrintPageEventArgs.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.PrinterSettings.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintingServices.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintingServices.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // Copyright (C) 2005 Novell, Inc. http://www.novell.com
 //

diff --git a/...braries/System.Drawing.Common/src/System/Drawing/Printing/StandardPrintController.Unix.cs b/...braries/System.Drawing.Common/src/System/Drawing/Printing/StandardPrintController.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.StandardPrintController.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/SRDescriptionAttribute.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/SRDescriptionAttribute.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.SRDescriptionAttribute.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/SystemFonts.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/SystemFonts.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // Copyright (C) 2005, 2007 Novell, Inc (http://www.novell.com)
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/SystemIcons.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/SystemIcons.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.SystemIcons.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/ToolboxBitmapAttribute.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/ToolboxBitmapAttribute.Unix.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.ToolboxBitmapAttribute.cs
 //

diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/macFunctions.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/macFunctions.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+
 //
 // System.Drawing.carbonFunctions.cs
 //

diff --git a/src/libraries/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerableFactory.cs b/src/libraries/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerableFactory.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file ref the project root for more information.
 
 using System;
 using System.Collections.Generic;

diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs b/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs
@@ -916,7 +916,7 @@ private async Task StartRequestAsync(WinHttpRequestState state)
                      (responseMessage.StatusCode >= HttpStatusCode.RedirectKeepVerb && responseMessage.StatusCode <= (HttpStatusCode)308)) &&
                     state.RequestMessage.RequestUri.Scheme == Uri.UriSchemeHttps && responseMessage.Headers.Location?.Scheme == Uri.UriSchemeHttp)
                 {
-                    NetEventSource.Error(this, $"Insecure https to http redirect from {state.RequestMessage.RequestUri.ToString()} to {responseMessage.Headers.Location.ToString()} blocked.");
+                    NetEventSource.Error(this, $"Insecure https to http redirect from {state.RequestMessage.RequestUri} to {responseMessage.Headers.Location} blocked.");
                 }
             }
             catch (Exception ex)

diff --git a/...ies/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.NtAuth.cs b/...ies/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.NtAuth.cs
@@ -79,7 +79,7 @@ private static async Task<HttpResponseMessage> SendWithNtAuthAsync(HttpRequestMe
 
                         if (NetEventSource.Log.IsEnabled())
                         {
-                            NetEventSource.Info(connection, $"Authentication: {challenge.AuthenticationType}, Uri: {authUri.AbsoluteUri.ToString()}");
+                            NetEventSource.Info(connection, $"Authentication: {challenge.AuthenticationType}, Uri: {authUri.AbsoluteUri}");
                         }
 
                         // Calculate SPN (Service Principal Name) using the host name of the request.