Merge WPF Framework

Author: adegeo

.openpublishing.redirection.wpf.json

@@ -199,6 +199,32 @@
         {
             "source_path": "dotnet-desktop-guide/wpf/advanced/xaml-overview.md",
             "redirect_url": "/dotnet/desktop/wpf/xaml/index"
+        },
+        {
+            "source_path": "dotnet-desktop-guide/wpf/getting-started/whats-new.md",
+            "redirect_url": "/dotnet/desktop/wpf/whats-new/framework45"
+        },
+        {
+            "source_path": "dotnet-desktop-guide/wpf/getting-started/index.md",
+            "redirect_url": "/dotnet/desktop/wpf/get-started/create-app-visual-studio"
+        },
+        {
+            "source_path": "dotnet-desktop-guide/wpf/getting-started/introduction-to-wpf-in-vs.md",
+            "redirect_url": "/dotnet/desktop/wpf/get-started/create-app-visual-studio"
+        },
+        {
+            "source_path": "dotnet-desktop-guide/wpf/getting-started/walkthrough-my-first-wpf-desktop-application.md",
+            "redirect_url": "/dotnet/desktop/wpf/get-started/walkthrough-my-first-wpf-desktop-application"
+        },
+        {
+            "source_path": "dotnet-desktop-guide/wpf/getting-started/community-feedback.md",
+            "redirect_url": "/dotnet/desktop/wpf/"
+        },
+        {
+            "source_path": "dotnet-desktop-guide/wpf/getting-started/wpf-walkthroughs.md",
+            "redirect_url": "/dotnet/desktop/wpf/get-started/wpf-walkthroughs"
         }
+
+        
     ]
 }

dotnet-desktop-guide/TOC.yml

@@ -2,4 +2,6 @@ items:
 - name: Windows Forms
   href: winforms/index.yml
 - name: Windows Presentation Foundation
-  href: wpf/index.yml?view=netdesktop-9.0&preserve-view=true
+  href: wpf/index.yml
+- name: XAML language reference
+  href: xaml-services/index.md

dotnet-desktop-guide/breadcrumb/toc.yml

@@ -3,20 +3,24 @@ items:
   tocHref: /dotnet
   topicHref: /dotnet/index
   items:
-  - name: Windows Forms
-    tocHref: /dotnet/desktop/winforms
-    topicHref: /dotnet/desktop/winforms/index
+  - name: Windows Desktop
+    tocHref: /dotnet/desktop/
+    topicHref: /dotnet/desktop/index
     items:
-    - name: Controls
-      tocHref: /dotnet/desktop/winforms/controls
-      topicHref: /dotnet/desktop/winforms/controls/index
-    - name: Design
-      tocHref: /dotnet/desktop/winforms/controls-design
-      topicHref: /dotnet/desktop/winforms/controls-design/index
-    - name: Advanced
-      tocHref: /dotnet/desktop/winforms/advanced
-      topicHref: /dotnet/desktop/winforms/advanced/index
-  - name: Windows Presentation Foundation
-    tocHref: /dotnet/desktop/wpf
-    topicHref: /dotnet/desktop/wpf/index
+    - name: Windows Forms
+      tocHref: /dotnet/desktop/winforms
+      topicHref: /dotnet/desktop/winforms/index
+      items:
+      - name: Controls
+        tocHref: /dotnet/desktop/winforms/controls
+        topicHref: /dotnet/desktop/winforms/controls/index
+      - name: Design
+        tocHref: /dotnet/desktop/winforms/controls-design
+        topicHref: /dotnet/desktop/winforms/controls-design/index
+      - name: Advanced
+        tocHref: /dotnet/desktop/winforms/advanced
+        topicHref: /dotnet/desktop/winforms/advanced/index
 
+    - name: Windows Presentation Foundation
+      tocHref: /dotnet/desktop/wpf
+      topicHref: /dotnet/desktop/wpf/index

dotnet-desktop-guide/docfx.json

@@ -27,28 +27,22 @@
         "xaml-services/**/**.md": "/dotnet/desktop/xaml-services/breadcrumb/toc.json"
       },
       "titleSuffix": {
-        "framework/winforms/**/**.md": "Windows Forms .NET Framework",
         "winforms/**/**.md": "Windows Forms",
-        "framework/wpf/**/**.md": "WPF .NET Framework",
-        "net/wpf/**/**.md": "WPF .NET",
+        "wpf/**/**.md": "WPF .NET",
         "xaml-services/**/*.md": "XAML"
       },
       "ms.subservice": {
-        "framework/winforms/**/**.md": "winforms",
-        "framework/wpf/**/**.md": "wpf",
         "winforms/**/**.md": "winforms",
-        "net/wpf/**/**.md": "wpf",
+        "wpf/**/**.md": "wpf",
         "xaml-services/**/*.md": "wpf"
       },
       "ms.service": {
         "xaml-services/**/*.md": "dotnet-desktop",
         "xaml-services/**/*.yml": "dotnet-desktop"
       },
       "ms.topic": {
-        "framework/winforms/**/**.md": "conceptual",
-        "framework/wpf/**/**.md": "conceptual",
         "winforms/**/**.md": "conceptual",
-        "net/wpf/**/**.md": "conceptual",
+        "wpf/**/**.md": "conceptual",
         "winforms/compiler-messages/**.md": "error-reference",
         "winforms/wfdev-diagnostics/**.md": "error-reference",
         "xaml-services/**/*.md": "reference",