Sgen: Update progress when importing types (#46415)

* Sgen: Update progress when importing types * Null check * Remove trailing whitespace * Updated Strings.resx * Sgen: Use string resource
dotnet · Jun 29, 2021 · 53e6b47 · 53e6b47
1 parent 5d29560
commit 53e6b47
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/src/Sgen.cs b/src/libraries/Microsoft.XmlSerializer.Generator/src/Sgen.cs
@@ -36,7 +36,7 @@ private int Run(string[] args)
             bool noLogo = false;
             bool parsableErrors = false;
             bool silent = false;
-            bool warnings = false;
+            bool verbose = false;
 
             AppDomain.CurrentDomain.AssemblyResolve += SgenAssemblyResolver;
 
@@ -120,7 +120,7 @@ private int Run(string[] args)
                     }
                     else if (ArgumentMatch(arg, "verbose"))
                     {
-                        warnings = true;
+                        verbose = true;
                     }
                     else if (ArgumentMatch(arg, "reference"))
                     {
@@ -189,7 +189,7 @@ private int Run(string[] args)
                     ParseReferences();
                 }
 
-                GenerateFile(types, assembly, proxyOnly, silent, warnings, force, codePath, parsableErrors);
+                GenerateFile(types, assembly, proxyOnly, silent, verbose, force, codePath, parsableErrors);
             }
             catch (Exception e)
             {
@@ -205,7 +205,7 @@ private int Run(string[] args)
             return 0;
         }
 
-        private void GenerateFile(List<string> typeNames, string assemblyName, bool proxyOnly, bool silent, bool warnings, bool force, string outputDirectory, bool parsableerrors)
+        private void GenerateFile(List<string> typeNames, string assemblyName, bool proxyOnly, bool silent, bool verbose, bool force, string outputDirectory, bool parsableerrors)
         {
             Assembly assembly = LoadAssembly(assemblyName, true);
             Type[] types;
@@ -258,6 +258,11 @@ private void GenerateFile(List<string> typeNames, string assemblyName, bool prox
                 {
                     if (type != null)
                     {
+                        if (verbose)
+                        {
+                            Console.WriteLine(SR.Format(SR.ImportInfo, type.Name, i + 1, types.Length));
+                        }
+
                         bool isObsolete = false;
                         object[] obsoleteAttributes = type.GetCustomAttributes(typeof(ObsoleteAttribute), false);
                         foreach (object attribute in obsoleteAttributes)
@@ -278,7 +283,7 @@ private void GenerateFile(List<string> typeNames, string assemblyName, bool prox
                 //Ignore the FileNotFoundException when call GetCustomAttributes e.g. if the type uses the attributes defined in a different assembly
                 catch (FileNotFoundException e)
                 {
-                    if (warnings)
+                    if (verbose)
                     {
                         Console.Out.WriteLine(FormatMessage(parsableerrors, true, SR.Format(SR.InfoIgnoreType, type.FullName)));
                         WriteWarning(e, parsableerrors);
@@ -289,7 +294,7 @@ private void GenerateFile(List<string> typeNames, string assemblyName, bool prox
 
                 if (!proxyOnly)
                 {
-                    ImportType(type, mappings, importedTypes, warnings, importer, parsableerrors);
+                    ImportType(type, mappings, importedTypes, verbose, importer, parsableerrors);
                 }
             }
 

diff --git a/src/libraries/System.Private.Xml/src/Resources/Strings.resx b/src/libraries/System.Private.Xml/src/Resources/Strings.resx
@@ -3453,4 +3453,7 @@ Usage: dotnet {0} [--assembly &lt;assembly file path&gt;] [--type &lt;type name&
   <data name="CompilingScriptsNotSupported" xml:space="preserve">
     <value>Compiling JScript/CSharp scripts is not supported</value>
   </data>
+  <data name="ImportInfo" xml:space="preserve">
+    <value>Importing {0} ({1}/{2})</value>
+  </data>
 </root>