Merge pull request #4018 from dotnet/publish-28254

Merge master into live

Author: BillWagner

samples/snippets/csharp/VS_Snippets_CLR/TransactedInstaller/CS/transactedinstaller.cs

@@ -15,6 +15,7 @@ If the '/?' or '/help' option is provided then the help information is
    printed to the console.
  */
 
+// <Snippet1>
 using System;
 using System.ComponentModel;
 using System.Collections;
@@ -23,12 +24,9 @@ printed to the console.
 
 public class TransactedInstaller_Example
 {
+// <Snippet2>
    public static void Main(String[] args)
    {
-// <Snippet1>
-// <Snippet2>
-// <Snippet3>
-// <Snippet4>
       ArrayList myOptions = new ArrayList();
       String myOption;
       bool toUnInstall = false;
@@ -73,13 +71,13 @@ public static void Main(String[] args)
                      args[i]);
                   return;
                }
-            
+
                // Create a instance of 'AssemblyInstaller' that installs the given assembly.
                myAssemblyInstaller = 
                   new AssemblyInstaller(args[i], 
                   (string[]) myOptions.ToArray(typeof(string)));
                // Add the instance of 'AssemblyInstaller' to the 'TransactedInstaller'.  
-               myTransactedInstaller.Installers.Add(myAssemblyInstaller);
+               myTransactedInstaller.Installers.Add(myAssemblyInstaller);  
             }
          }
          // If user requested help or didn't provide any assemblies to install
@@ -105,13 +103,9 @@ public static void Main(String[] args)
       catch(Exception e)
       {
          Console.WriteLine("\nException raised : {0}", e.Message);
-      }  
-// </Snippet4>
-// </Snippet3>
-// </Snippet2>
-// </Snippet1>
+      }
    }  
-
+   
    public static void PrintHelpMessage()
    {
       Console.WriteLine("Usage : TransactedInstaller [/u | /uninstall] [option [...]] assembly" +
@@ -120,4 +114,5 @@ public static void PrintHelpMessage()
          " the given assembly. If /u or /uninstall option" +
          " is given it uninstalls the assemblies.");
    }
-}
+}
+// </Snippet1>

snippets/System.Text/Rune/csharp/TrimNonLettersAndNonDigits.cs

@@ -44,7 +44,7 @@ static ReadOnlySpan<char> TrimNonLettersAndNonDigits(ReadOnlySpan<char> span)
 
                 return span;
             }
-            // <SnippetExample>
+            // </SnippetExample>
         }
     }
 }

xml/Microsoft.Extensions.Hosting/WindowsServiceLifetimeHostBuilderExtensions.xml

@@ -43,8 +43,7 @@
         <summary>Sets the host lifetime to WindowsServiceLifetime, sets the Content Root,
             and enables logging to the event log with the application name as the default source name.</summary>
         <returns>The same instance of the <see cref="T:Microsoft.Extensions.Hosting.IHostBuilder" /> for chaining.</returns>
-        <remarks>This is context aware and will only activate if it detects the process is running
-            as a Windows Service.</remarks>
+        <remarks>This is context aware and will only activate if it detects the process is running as a Windows Service.</remarks>
       </Docs>
     </Member>
   </Members>