Merge pull request #45 from dotnet/master

Merge master into live

.ghal.rules.json

@@ -18,10 +18,10 @@
         },
         "contentsource": {
           "(?i).*dotnet-desktop-guide\/framework\/wpf.*": {
-            "labels-add": ":books: Area - .Framework,:card_file_box: Technology - WPF"
+            "labels-add": ":books: Area - .NET Framework,:card_file_box: Technology - WPF"
           },
           "(?i).*dotnet-desktop-guide\/framework\/winforms.*": {
-            "labels-add": ":books: Area - .Framework,:card_file_box: Technology - WinForms"
+            "labels-add": ":books: Area - .NET Framework,:card_file_box: Technology - WinForms"
           },
           "(?i).*dotnet-desktop-guide\/net\/wpf.*": {
             "labels-add": ":books: Area - .NET,:card_file_box: Technology - WPF"
@@ -50,10 +50,10 @@
           "processor-files": {
             "changedfile": {
               "(?i).*dotnet-desktop-guide\/framework\/wpf.*": {
-                "labels-add": ":books: Area - .Framework,:card_file_box: Technology - WPF"
+                "labels-add": ":books: Area - .NET Framework,:card_file_box: Technology - WPF"
               },
               "(?i).*dotnet-desktop-guide\/framework\/winforms.*": {
-                "labels-add": ":books: Area - .Framework,:card_file_box: Technology - WinForms"
+                "labels-add": ":books: Area - .NET Framework,:card_file_box: Technology - WinForms"
               },
               "(?i).*dotnet-desktop-guide\/net\/wpf.*": {
                 "labels-add": ":books: Area - .NET,:card_file_box: Technology - WPF"

.github/workflows/build-validation.yml

@@ -9,19 +9,19 @@ on:
       - "**.cs"
       - "**.vb"
       - "**.fs"
-      - "**.cpp"
-      - "**.h"
       - "**.xaml"
       - "**.razor"
       - "**.cshtml"
       - "**.vbhtml"
-      - "**.*proj"
+      - "**.csproj"
+      - "**.vbproj"
+      - "**.fsproj"
       - "**global.json"
       - "**snippets.5000.json"
     branches: [ master ]
 
 env:
-  DOTNET_INSTALLER_CHANNEL: 'release/5.0.1xx-preview7'
+  DOTNET_INSTALLER_CHANNEL: 'release/5.0.1xx'
   DOTNET_DO_INSTALL: 'true'
   EnableNuGetPackageRestore: 'True'
 

dotnet-desktop-guide/TOC.yml

@@ -3,11 +3,12 @@ items:
   expanded: true
   items:
   - name: ".NET 5 (and .NET Core 3.1)"
-    href: https://docs.microsoft.com/dotnet/desktop/winforms/?view=netdesktop-5.0
+    href: net/winforms/index.md?view=netdesktop-5.0&preserve-view=true
   - name: .NET Framework
-    href: https://docs.microsoft.com/dotnet/desktop/winforms/?view=netframeworkdesktop-4.8
+    href: framework/winforms/index.yml?view=netframeworkdesktop-4.8&preserve-view=true
 - name: Windows Presentation Foundation
   expanded: true
   items:
   - name: .NET Framework
-    href: https://docs.microsoft.com/dotnet/desktop/wpf/?view=netframeworkdesktop-4.8
+    href: framework/wpf/index.md?view=netframeworkdesktop-4.8&preserve-view=true
+    

dotnet-desktop-guide/docfx.json

@@ -140,6 +140,18 @@
         "net/winforms/**/**.md": "Windows Forms .NET",
         "framework/wpf/**/**.md": "WPF .NET Framework",
         "net/wpf/**/**.md": "WPF .NET"
+      },
+      "ms.technology": {
+        "framework/winforms/**/**.md": "dotnet-winforms",
+        "framework/wpf/**/**.md": "dotnet-wpf",
+        "net/winforms/**/**.md": "dotnet-winforms",
+        "net/wpf/**/**.md": "dotnet-wpf"
+      },
+      "ms.prod": {
+        "framework/winforms/**/**.md": "dotnet-framework",
+        "framework/wpf/**/**.md": "dotnet-framework",
+        "net/winforms/**/**.md": "dotnet-desktop",
+        "net/wpf/**/**.md": "dotnet-desktop"
       }
     },
     "template": [],

dotnet-desktop-guide/framework/breadcrumb/toc.yml

@@ -1,15 +1,15 @@
 items:
 - name: Docs
-  tocHref: /
+  tocHref: /?view=&preserve-view=true
-  topicHref: /
+  topicHref: /?view=&preserve-view=true
   items:
     - name: .NET
-      tocHref: /dotnet/
+      tocHref: /dotnet/?view=&preserve-view=true
-      topicHref: /dotnet/index
+      topicHref: /dotnet/index?view=&preserve-view=true
       items:
       - name: Desktop Guide
-        tocHref: /dotnet/desktop
+        tocHref: /dotnet/desktop?view=&preserve-view=true
-        topicHref: /dotnet/desktop/index
+        topicHref: /dotnet/desktop/index?view=&preserve-view=true
         items:
         - name: .NET Framework
           items:

dotnet-desktop-guide/index.md

@@ -1,6 +1,7 @@
 ---
 title: Desktop Guide for WPF and Windows Forms
 description: Introduction to the Desktop Guide for WPF and Windows Forms for both .NET 5 and .NET Framework.
+ms.prod: dotnet-desktop
 ms.date: "08/30/2020"
 ---
 
@@ -14,11 +15,11 @@ Historically, the .NET Framework-based documentation for WPF and WinForms has be
 
 There are two implementations of WPF, each with it's own documentation:
 
-01. The [.NET Framework 4 implementation](framework/wpf/index.md?view=netframeworkdesktop-4.8) that's supported by Visual Studio 2019 and Visual Studio 2017.
+01. The [.NET Framework 4 implementation](framework/wpf/index.md?view=netframeworkdesktop-4.8&preserve-view=true) that's supported by Visual Studio 2019 and Visual Studio 2017.
 
     .NET Framework 4 is a Windows-only version of .NET and is considered a Windows Operating System component. This version of Windows Presentation Foundation is distributed with .NET Framework.
 
-    The documentation for this version of WPF is available [here](framework/wpf/index.md?view=netframeworkdesktop-4.8).
+    The documentation for this version of WPF is available [here](framework/wpf/index.md?view=netframeworkdesktop-4.8&preserve-view=true).
 
 01. The open-source implementation hosted on [GitHub](https://github.com/dotnet/wpf).
 
@@ -32,11 +33,11 @@ There are two implementations of WPF, each with it's own documentation:
 
 There are two implementations of Windows Forms, each with it's own documentation:
 
-01. The [.NET Framework 4 implementation](framework/winforms/index.yml?view=netframeworkdesktop-4.8) that's supported by Visual Studio 2019 and Visual Studio 2017.
+01. The [.NET Framework 4 implementation](framework/winforms/index.yml?view=netframeworkdesktop-4.8&preserve-view=true) that's supported by Visual Studio 2019 and Visual Studio 2017.
 
     .NET Framework 4 is a Windows-only version of .NET and is considered a Windows Operating System component. This version of WinForms is distributed with .NET Framework.
 
-    The documentation for this version of WinForms is available [here](framework/winforms/index.yml?view=netframeworkdesktop-4.8).
+    The documentation for this version of WinForms is available [here](framework/winforms/index.yml?view=netframeworkdesktop-4.8&preserve-view=true).
 
 01. The open-source implementation hosted on [GitHub](https://github.com/dotnet/winforms).
 

dotnet-desktop-guide/net/breadcrumb/toc.yml

@@ -1,18 +1,18 @@
 items:
 - name: Docs
-  tocHref: /
+  tocHref: /?view=&preserve-view=true
-  topicHref: /
+  topicHref: /?view=&preserve-view=true
   items:
     - name: .NET
-      tocHref: /dotnet/
+      tocHref: /dotnet/?view=&preserve-view=true
-      topicHref: /dotnet/index
+      topicHref: /dotnet/index?view=&preserve-view=true
       items:
       - name: Desktop Guide
-        tocHref: /dotnet/desktop
+        tocHref: /dotnet/desktop?view=&preserve-view=true
-        topicHref: /dotnet/desktop/index
+        topicHref: /dotnet/desktop/index?view=&preserve-view=true
         items:
         - name: ".NET 5 (and .NET Core 3.1)"
           items:
           - name: Windows Forms
-            tocHref: /dotnet/desktop/winforms
+            tocHref: /dotnet/desktop/winforms/
             topicHref: /dotnet/desktop/winforms/index