Merge pull request #3785 from microsoft/dev

Sync from dev

code/src/UI/VisualStudio/RightClickActions.cs

@@ -25,6 +25,12 @@ namespace Microsoft.Templates.UI.VisualStudio
 {
     public class RightClickActions : IContextProvider
     {
+        private readonly Dictionary<string, IEnumerable<TemplateType>> availableOptions = new Dictionary<string, IEnumerable<TemplateType>>()
+        {
+            { Platforms.Uwp, new List<TemplateType>() { TemplateType.Page, TemplateType.Feature, TemplateType.Service, TemplateType.Testing } },
+            { Platforms.Wpf, new List<TemplateType>() { TemplateType.Page, TemplateType.Feature } },
+        };
+
         private readonly GenerationService _generationService = GenerationService.Instance;
 
         private static VsGenShell _shell;
@@ -139,11 +145,21 @@ public void AddNewTesting()
         public bool Visible(TemplateType templateType)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
-            return _shell.GetActiveProjectIsWts() && EnsureGenContextInitialized() &&
-                GenContext.ToolBox.Repo.GetAll().Any(
-                    t => t.GetTemplateType() == templateType &&
-                    t.GetRightClickEnabled() == true &&
-                    t.GetIsHidden() == false);
+            if (!_shell.GetActiveProjectIsWts())
+            {
+                return false;
+            }
+
+            var projectPlatform = ProjectMetadataService.GetProjectMetadata(_shell.GetActiveProjectPath()).Platform;
+
+            if (availableOptions.ContainsKey(projectPlatform) && availableOptions[projectPlatform].Contains(templateType))
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
         }
 
         public bool Visible()

docs/getting-started-extension.md

@@ -58,7 +58,7 @@ Then, go again to **Extensions -> Manage Extensions** and using the recently add
 
 Once installed, you will see a new Project Template which allows you to access to the available templates: Pre-Release version uses the VNext Template Repository.
 
-![File New Project](resources/vsix/newProject2019-dev.PNG)
+![File New Project](resources/vsix/newProject2019-pre.PNG)
 
 You can start working with Windows Template Studio by cloning [our repo](https://github.com/Microsoft/WindowsTemplateStudio) and working locally with the code and the available templates.  If you plan to contribute, please follow the [contribution guidelines](../CONTRIBUTING.md)
 

docs/roadmap.md

@@ -6,18 +6,24 @@ In addition to the functionality listed below, each release will also include bu
 
 ## Next release
 
-#### 3.7
+#### 3.8
 
-- WPF (.NET Core 3) project creation
-- Remove VS 2017 support
+- Add CodeBehind framework for WPF
+- Add more WPF pages:
+    - WPF Xaml Island page
+    - Content Grid Page
+    - Data Grid Page
 
-[Track progress](https://github.com/Microsoft/WindowsTemplateStudio/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+milestone%3A3.7)
+- WPF Toast Notifications
+- WPF Testing templates
+
+[Track progress](https://github.com/Microsoft/WindowsTemplateStudio/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+milestone%3A3.8)
 
 ## Upcoming releases
 
-### 3.8 / 3.9
-- Add more WPF templates (Xaml Islands Page, Desktop Notifications,...)
-  
+### 3.9
+- Add more WPF templates
+
 ### 4.0
 - WinUI 3 Desktop Application creation
 
@@ -29,6 +35,7 @@ You can see a list of other items we'd like to get to, and which will form part
 
 
 ## Past releases
+- [3.7 - July 2020](https://github.com/Microsoft/WindowsTemplateStudio/issues?utf8=%E2%9C%93&q=is%3Aissue+milestone%3A3.7)
 - [3.6 - May 2020](https://github.com/Microsoft/WindowsTemplateStudio/issues?utf8=%E2%9C%93&q=is%3Aissue+milestone%3A3.6)
 - [3.5 - November 2019](https://github.com/Microsoft/WindowsTemplateStudio/issues?utf8=%E2%9C%93&q=is%3Aissue+milestone%3A3.5)
 - [3.4 - September 2019](https://github.com/Microsoft/WindowsTemplateStudio/issues?utf8=%E2%9C%93&q=is%3Aissue+milestone%3A%22Hotfix+3.4%22)

docs/telemetryData.md

@@ -1,116 +1,117 @@
-# Telemetry for Windows Template Studio - 2020.05
+# Telemetry for Windows Template Studio - 2020.06
 
 As new features and pages roll out, percentages  will adjust.
 
-## Project Type
+## Project Type (Uwp)
 
 |Project|Percentage|
 |:---|:---:|
-|Navigation View|65.5%|
-|Blank|12.7%|
-|MenuBar|11.3%|
-|Horizontal Navigation View|10.5%|
+|Navigation View|65.1%|
+|Horizontal Navigation View|12.7%|
+|Blank|12.6%|
+|MenuBar|9.7%|
 
-## Framework
+## Framework (Uwp)
 
 |Framework Type|Percentage|
 |:---|:---:|
-|CodeBehind|56.2%|
-|MVVM Basic|17.9%|
-|MVVM Light|11.2%|
-|Prism|7.6%|
-|Caliburn.Micro|7.2%|
+|CodeBehind|55%|
+|MVVM Basic|18.4%|
+|MVVM Light|10.9%|
+|Prism|7.9%|
+|Caliburn.Micro|7.8%|
 
-## Pages
+## Pages (Uwp)
 
 |Pages|Percentage|
 |:---|:---:|
-|Blank|34.6%|
-|Settings|13.7%|
-|Master/Detail|8.2%|
-|DataGrid|6.7%|
-|Content Grid|5.9%|
-|Web View|3.7%|
-|Chart|2.9%|
-|TreeView|2.9%|
-|TabView|2.9%|
-|Map|2.8%|
-|Two Pane View|2.4%|
-|Media Player|2.3%|
-|Telerik Data Grid|2.2%|
-|Tabbed / Pivot|2.1%|
-|ImageGallery|1.9%|
-|Camera|1.5%|
-|Ink Draw Picture|1.2%|
-|Ink Draw|1.1%|
+|Blank|34.1%|
+|Settings|13.8%|
+|Master/Detail|9.1%|
+|DataGrid|7.1%|
+|Content Grid|5.8%|
+|Web View|4.3%|
+|Chart|2.8%|
+|Tabbed / Pivot|2.8%|
+|TreeView|2.8%|
+|TabView|2.7%|
+|Telerik Data Grid|2.5%|
+|Two Pane View|2.3%|
+|ImageGallery|2%|
+|Map|2%|
+|Media Player|1.9%|
+|Camera|1.3%|
+|Ink Draw|1%|
 |Ink Smart Canvas|0.9%|
+|Ink Draw Picture|0.9%|
 
-## Features
+## Features (Uwp)
 
 |Features|Percentage|
 |:---|:---:|
-|Settings Storage|22.7%|
-|Theme Selection|21.9%|
-|App Config|7.7%|
-|Toast Notifications|6.5%|
-|Multiple views|5.5%|
-|First Run Prompt|3.6%|
-|Suspend and Resume|3.4%|
-|Drag & Drop|3.3%|
-|Deep Linking|3.2%|
-|Background Task|3%|
-|What's New Prompt|2.6%|
-|Live Tile|2.5%|
-|User Activity|2.1%|
-|Share Source|1.8%|
+|Settings Storage|23.2%|
+|Theme Selection|22.1%|
+|App Config|8.4%|
+|Multiple views|5.8%|
+|Toast Notifications|5.3%|
+|First Run Prompt|3.8%|
+|Background Task|3.6%|
+|What's New Prompt|3%|
+|Drag & Drop|3%|
+|Deep Linking|3%|
+|Suspend and Resume|2.4%|
+|Live Tile|2.2%|
+|User Activity|2%|
+|Multi-Instance|1.8%|
 |VS App Center Analytics|1.7%|
+|Share Source|1.5%|
 |Command Line Launch|1.5%|
-|Multi-Instance|1.4%|
-|Web to App link|1.2%|
-|Feedback Hub Link|1.1%|
+|Feedback Hub Link|1.5%|
+|Web to App link|1.1%|
 |Share Target|1%|
-|Multi-Instance Advanced|0.6%|
-|3D App Launcher|0.6%|
-|Dev Center Notifications|0.5%|
+|Dev Center Notifications|0.7%|
+|Multi-Instance Advanced|0.7%|
 |Azure Notifications|0.5%|
+|3D App Launcher|0.4%|
 
-## Services
+## Services (Uwp)
 
 |Services|Percentage|
 |:---|:---:|
-|Sample Data|49.9%|
-|HTTP Data Service|13.2%|
-|SQL Server Data|10.8%|
-|XAML Styler Config|7.3%|
-|Web API|5.7%|
-|Optional Login|5.6%|
-|Forced Login|5.6%|
-|Secured Web API|1.9%|
+|Sample Data|50.8%|
+|HTTP Data Service|12.5%|
+|SQL Server Data|12.1%|
+|XAML Styler Config|8%|
+|Forced Login|6.1%|
+|Optional Login|5.8%|
+|Web API|3.5%|
+|Secured Web API|1.1%|
 
-## Testing
+## Testing (Uwp)
 
 |Testing|Percentage|
 |:---|:---:|
-|Test App with MSTest|27%|
-|Test App with xUnit|24.9%|
-|Test Core library with xUnit|18.3%|
-|Win App Driver|12.5%|
-|Test Core library with MSTest|9.3%|
-|Test Core library with NUnit|8.1%|
+|Test App with xUnit|29.8%|
+|Test App with MSTest|27.3%|
+|Test Core library with xUnit|21.1%|
+|Test Core library with MSTest|7.8%|
+|Test Core library with NUnit|7.4%|
+|Win App Driver|6.6%|
 
-## Windows Template Studio entry point
+## Windows Template Studio entry point (Common)
 
 |Entry point|Percentage|
 |:---|:---:|
-|New Project|86.9%|
-|Add Page|8.5%|
+|New Project|88.5%|
+|Add Page|7.2%|
 |Add Feature|2.9%|
-|Add Service|1.4%|
-|Add Testing|0.3%|
+|Add Service|1.2%|
+|Add Testing|0.2%|
 
-## Programming languages
+## Programming languages (Common)
 
 |Languages|Percentage|
 |:---|:---:|
-|C#|91.5%|
-|VisualBasic|8.5%|
+|C#|92.4%|
+|VisualBasic|7.6%|
+