Merge pull request #4555 from dotnet/publish-31708

Merge master into live

Author: BillWagner

samples/snippets/csharp/VS_Snippets_CLR/pathcombine/CS/pathcombine.cs

@@ -57,7 +57,7 @@ private static void CombinePaths(string p1, string p2) {
 // When you combine '' and 'subdir\file.txt', the result is:
 // 'subdir\file.txt'
 //
-// You cannot combine '' and 'subdir\file.txt' because:
+// You cannot combine 'null' and 'subdir\file.txt' because:
 // Value cannot be null.
 // Parameter name: path1
-//</snippet1>
+//</snippet1>

samples/snippets/csharp/VS_Snippets_Wpf/PageNavigationServiceSnippets/CSharp/HomePage.xaml.cs

@@ -18,7 +18,7 @@ public HomePage()
             InitializeComponent();
 
             // Don't allow back navigation if no navigation service
-            if (this.NavigationService != null)
+            if (this.NavigationService == null)
             {
                 this.goBackButton.IsEnabled = false;
             }
@@ -34,4 +34,4 @@ void goBackButton_Click(object sender, RoutedEventArgs e)
         }
     }
     //</SnippetGetPageNavigationServiceCODEBEHIND>
-}
+}

samples/snippets/csharp/api/system.reflection.metadata/metadatareader/MetadataReaderSnippets.cs

@@ -0,0 +1,30 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Reflection.Metadata;
+using System.Reflection.PortableExecutable;
+
+namespace MetadataReaderSnippets
+{
+    class MetadataReaderSnippets
+    {
+        public static void Run()
+        {
+            //<SnippetMetadataReader>
+            using var fs = new FileStream("Example.dll", FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+            using var peReader = new PEReader(fs);
+
+            MetadataReader mr = peReader.GetMetadataReader();
+
+            foreach (TypeDefinitionHandle tdefh in mr.TypeDefinitions)
+            {
+                TypeDefinition tdef = mr.GetTypeDefinition(tdefh);
+
+                string ns = mr.GetString(tdef.Namespace);
+                string name = mr.GetString(tdef.Name);
+                Console.WriteLine($"{ns}.{name}");
+            }
+            //</SnippetMetadataReader>
+        }
+    }
+}

samples/snippets/csharp/api/system.reflection.metadata/metadatareader/MetadataReaderSnippets.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Reflection.Metadata" Version="1.8.0" />
+  </ItemGroup>
+
+</Project>

samples/snippets/csharp/api/system.reflection.metadata/metadatareader/Program.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace MetadataReaderSnippets
+{
+    class Program
+    {
+        static void Main()
+        {
+            MetadataReaderSnippets.Run();
+        }
+    }
+}

samples/snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/homepage.xaml.vb

@@ -15,7 +15,7 @@ Namespace VisualBasic
             InitializeComponent()
 
             ' Don't allow back navigation if no navigation service
-            If Me.NavigationService IsNot Nothing Then
+            If Me.NavigationService Is Nothing Then
                 Me.goBackButton.IsEnabled = False
             End If
         End Sub
@@ -28,4 +28,4 @@ Namespace VisualBasic
         End Sub
     End Class
     '</SnippetGetPageNavigationServiceCODEBEHIND>
-End Namespace
+End Namespace

xml/FrameworksIndex/net-5.0.xml

@@ -199,7 +199,9 @@ The instance of the <xref:System.Buffers.ArrayPool%601> class created by this me
 ## Remarks  
 
 This buffer is loaned to the caller and should be returned to the same pool using the <xref:System.Buffers.ArrayPool%601.Return%2A> method, so that it can be reused in subsequent calls to the <xref:System.Buffers.ArrayPool%601.Rent%2A> method. Failure to return a rented buffer is not a fatal error. However, it may lead to decreased application performance, as the pool may need to create a new buffer to replace the lost one.
- ]]></format>
+
+The array returned by this method may not be zero-initialized. 
+]]></format>
         </remarks>
       </Docs>
     </Member>

xml/System.Buffers/ArrayPool`1.xml

@@ -36,7 +36,7 @@
     <TypeForwarding From="System" FromVersion="4.0.0.0" To="System.ObjectModel" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="System.Windows" FromVersion="4.0.0.0" To="System.ObjectModel" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="netstandard" FromVersion="2.1.0.0" To="System.ObjectModel" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
-    <TypeForwarding From="WindowsBase" FromVersion="5.0.0.0" To="System.ObjectModel" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="WindowsBase" FromVersion="4.0.0.0" To="System.ObjectModel" ToVersion="0.0.0.0" FrameworkAlternate="net-5.0" />
     <TypeForwarding From="WindowsBase" FromVersion="4.0.0.0" To="System.ObjectModel" ToVersion="4.1.2.0" FrameworkAlternate="netcore-3.1" />
     <TypeForwarding From="WindowsBase" FromVersion="4.0.0.0" To="System" ToVersion="4.0.0.0" FrameworkAlternate="netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8" />
     <TypeForwarding From="System.Windows" FromVersion="4.0.0.0" To="System" ToVersion="4.0.0.0" FrameworkAlternate="netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;xamarinmac-3.0" />

xml/System.Collections.ObjectModel/ObservableCollection`1.xml

@@ -36,7 +36,7 @@
     <TypeForwarding From="System" FromVersion="4.0.0.0" To="System.ObjectModel" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="System.Windows" FromVersion="4.0.0.0" To="System.ObjectModel" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="netstandard" FromVersion="2.1.0.0" To="System.ObjectModel" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
-    <TypeForwarding From="WindowsBase" FromVersion="5.0.0.0" To="System.ObjectModel" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="WindowsBase" FromVersion="4.0.0.0" To="System.ObjectModel" ToVersion="0.0.0.0" FrameworkAlternate="net-5.0" />
     <TypeForwarding From="WindowsBase" FromVersion="4.0.0.0" To="System.ObjectModel" ToVersion="4.1.2.0" FrameworkAlternate="netcore-3.1" />
     <TypeForwarding From="WindowsBase" FromVersion="4.0.0.0" To="System" ToVersion="4.0.0.0" FrameworkAlternate="netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8" />
     <TypeForwarding From="System.Windows" FromVersion="4.0.0.0" To="System" ToVersion="4.0.0.0" FrameworkAlternate="netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;xamarinmac-3.0" />