Merge pull request #44101 from dotnet/main

Merge main into live

Author: dotnet-policy-service[bot]

docs/core/project-sdk/msbuild-props.md

@@ -1512,7 +1512,7 @@ The `EnableNUnitRunner` property enables or disables the use of the [NUnit runne
 
 ### GenerateTestingPlatformEntryPoint
 
-Setting the `GenerateTestingPlatformEntryPoint` property to `false` disables the automatic generation of the program entry point in an MSTest, NUnit, or xUnit test project. You might want to set this property to `false` when you manually define an entry point, or when you reference a test project from an executable that also has an entry point.
+Setting the `GenerateTestingPlatformEntryPoint` property to `false` disables the automatic generation of the program entry point in an MSTest or NUnit test project. You might want to set this property to `false` when you manually define an entry point, or when you reference a test project from an executable that also has an entry point.
 
 For more information, see [error CS8892](../testing/unit-testing-platform-faq.md#error-cs8892-method-testingplatformentrypointmainstring-will-not-be-used-as-an-entry-point-because-a-synchronous-entry-point-programmainstring-was-found).
 

docs/framework/migration-guide/snippets/csharp/versions-installed.cs

@@ -98,7 +98,8 @@ private static void Get45PlusFromRegistry()
         //<snippet2>
         const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
 
-        using (var ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey))
+        using (var baseKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32))
+        using (var ndpKey = baseKey.OpenSubKey(subkey))
         {
             if (ndpKey != null && ndpKey.GetValue("Release") != null)
             {

docs/framework/migration-guide/snippets/visual-basic/versions-installed.vb

@@ -72,7 +72,8 @@ Module Program
     Private Sub Get45PlusFromRegistry()
         Const subkey As String = "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\"
 
-        Using ndpKey As RegistryKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey)
+        Using baseKey As RegistryKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32),
+            ndpKey As RegistryKey = baseKey.OpenSubKey(subkey)
             If ndpKey IsNot Nothing AndAlso ndpKey.GetValue("Release") IsNot Nothing Then
                 Console.WriteLine($".NET Framework Version: {CheckFor45PlusVersion(ndpKey.GetValue("Release"))}")
             Else

docs/framework/wcf/feature-details/how-to-view-certificates-with-the-mmc-snap-in.md

@@ -5,6 +5,7 @@ ms.date: 02/25/2019
 helpviewer_keywords: 
   - "certificates [WCF], viewing with the MMC snap-in"
 ms.assetid: 2b8782aa-ebb4-4ee7-974b-90299e356dc5
+no-loc: [certlm.msc, certmgr.msc]
 ---
 # How to: View certificates with the MMC snap-in
 

docs/standard/serialization/system-text-json/snippets/use-dom-utf8jsonreader-utf8jsonwriter/csharp/JsonNodeAverageGradeExample.cs

@@ -38,8 +38,7 @@ public static void Main()
         double sum = 0;
         JsonNode document = JsonNode.Parse(jsonString)!;
 
-        JsonNode root = document.Root;
-        JsonArray studentsArray = root["Students"]!.AsArray();
+        JsonArray studentsArray = document["Students"]!.AsArray();
 
         int count = studentsArray.Count;
         foreach (JsonNode? student in studentsArray)