Merge pull request #547 from microsoft/implicitUsings

Turn on implicit usings and apply formatting rules
microsoft · May 14, 2022 · 14e48cf · 14e48cf
2 parents fe0775f + b913812
commit 14e48cf
Show file tree

Hide file tree

Showing 34 changed files with 185 additions and 247 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,6 +6,7 @@
     <BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(RepoRootPath)bin\$(MSBuildProjectName)\</BaseOutputPath>
     <PackageOutputPath>$(RepoRootPath)bin\Packages\$(Configuration)\</PackageOutputPath>
     <LangVersion>10.0</LangVersion>
+    <ImplicitUsings>true</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AnalysisLevel>latest</AnalysisLevel>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -4,5 +4,9 @@
     <EmbedUntrackedSources Condition=" '$(UseWPF)' == 'true' ">false</EmbedUntrackedSources>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Using Remove="System.Net.Http" />
+  </ItemGroup>
+
   <Import Project="$(_WpfTempProjectNuGetFilePathNoExt).targets" Condition="'$(_WpfTempProjectNuGetFilePathNoExt)' != '' and Exists('$(_WpfTempProjectNuGetFilePathNoExt).targets')"/>
 </Project>
diff --git a/src/Microsoft.Windows.CsWin32/ArrayTypeHandleInfo.cs b/src/Microsoft.Windows.CsWin32/ArrayTypeHandleInfo.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Linq;
 using System.Reflection;
 using System.Reflection.Metadata;
 using System.Runtime.InteropServices;
@@ -17,7 +16,7 @@ internal record ArrayTypeHandleInfo(TypeHandleInfo ElementType, ArrayShape Shape
 
     internal override TypeSyntaxAndMarshaling ToTypeSyntax(TypeSyntaxSettings inputs, CustomAttributeHandleCollection? customAttributes, ParameterAttributes parameterAttributes)
     {
-        var element = this.ElementType.ToTypeSyntax(inputs, customAttributes);
+        TypeSyntaxAndMarshaling element = this.ElementType.ToTypeSyntax(inputs, customAttributes);
         ArrayTypeSyntax arrayType = ArrayType(element.Type, SingletonList(ArrayRankSpecifier().AddSizes(this.Shape.Sizes.Select(size => LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(size))).ToArray<ExpressionSyntax>())));
         MarshalAsAttribute? marshalAs = element.MarshalAsAttribute is object ? new MarshalAsAttribute(UnmanagedType.LPArray) { ArraySubType = element.MarshalAsAttribute.Value } : null;
         return new TypeSyntaxAndMarshaling(arrayType, marshalAs);

diff --git a/src/Microsoft.Windows.CsWin32/BindingRedirects.cs b/src/Microsoft.Windows.CsWin32/BindingRedirects.cs
@@ -1,10 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -40,7 +36,7 @@ internal static void ApplyBindingRedirects()
         AssemblyName expected = new(args.Name);
         if (LocalAssemblies.Value.TryGetValue(expected.Name, out string? path))
         {
-            AssemblyName actual = AssemblyName.GetAssemblyName(path);
+            var actual = AssemblyName.GetAssemblyName(path);
             if (actual.Version >= expected.Version)
             {
                 return Assembly.LoadFile(path);

diff --git a/src/Microsoft.Windows.CsWin32/CustomAttributeTypeProvider.cs b/src/Microsoft.Windows.CsWin32/CustomAttributeTypeProvider.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
 using System.Reflection.Metadata;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
@@ -21,7 +20,7 @@ private CustomAttributeTypeProvider()
     public TypeSyntax GetTypeFromReference(MetadataReader reader, TypeReferenceHandle handle, byte rawTypeKind)
     {
         // CONSIDER: reuse GetNestingQualifiedName (with namespace support added) here.
-        var tr = reader.GetTypeReference(handle);
+        TypeReference tr = reader.GetTypeReference(handle);
         string name = reader.GetString(tr.Name);
         string ns = reader.GetString(tr.Namespace);
         return ParseName(ns + "." + name);

diff --git a/src/Microsoft.Windows.CsWin32/Docs.cs b/src/Microsoft.Windows.CsWin32/Docs.cs
@@ -1,11 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
 using MessagePack;
 using Microsoft.Windows.SDK.Win32Docs;
 
@@ -41,7 +37,7 @@ public static Docs Get(string docsPath)
         }
 
         using FileStream docsStream = File.OpenRead(docsPath);
-        var data = MessagePackSerializer.Deserialize<Dictionary<string, ApiDetails>>(docsStream);
+        Dictionary<string, ApiDetails>? data = MessagePackSerializer.Deserialize<Dictionary<string, ApiDetails>>(docsStream);
         var docs = new Docs(data);
 
         lock (DocsByPath)

diff --git a/src/Microsoft.Windows.CsWin32/FastSyntaxFactory.cs b/src/Microsoft.Windows.CsWin32/FastSyntaxFactory.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;

diff --git a/src/Microsoft.Windows.CsWin32/GenerationFailedException.cs b/src/Microsoft.Windows.CsWin32/GenerationFailedException.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
-
 namespace Microsoft.Windows.CsWin32;
 
 /// <summary>