Merge pull request #502 from Microsoft/dev

Fixes from Dev
microsoft · Jun 22, 2017 · 42c02ca · 42c02ca
2 parents 6e6e7dc + 0e64083
commit 42c02ca
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 37 deletions.
diff --git a/docs/roadmap.md b/docs/roadmap.md
@@ -1,38 +1,52 @@
 # Roadmap
 
-## 1.01 Releases - Hot fixes for critical bugs
-
-[1.01 - ASAP](https://github.com/Microsoft/WindowsTemplateStudio/issues?q=is%3Aopen+is%3Aissue+milestone%3A%221.01+-+Critical+Bug+Fixes%22)
-* 1.0.17142.1 Release
-    * [#277](https://github.com/Microsoft/WindowsTemplateStudio/issues/277): Templates download in background
-    * [#311](https://github.com/Microsoft/WindowsTemplateStudio/issues/311): Initial offline support for wizard (templates shipped w/ VSIX)
-    * [#326](https://github.com/Microsoft/WindowsTemplateStudio/issues/326): Clicking OK on Toast Notification restarts app
-    * [#327](https://github.com/Microsoft/WindowsTemplateStudio/issues/327): Prior Windows SDK no longer a requirement
-    * [#329](https://github.com/Microsoft/WindowsTemplateStudio/issues/329): Build Errors - must add a reference to assembly 'Windows, Version=255.255.255.255
-* 1.0.17137.1
-    * [#328](https://github.com/Microsoft/WindowsTemplateStudio/issues/328): Not compatible with Visual Studio Preview v15.3
-    * [#333](https://github.com/Microsoft/WindowsTemplateStudio/issues/333): Will not work if your TEMP folder is on a different drive to PROGRAMDATA
-
 ## 1.1 Release
 
-[1.1 - July 1, 2017 (TBD)](https://github.com/Microsoft/WindowsTemplateStudio/issues?q=is%3Aopen+is%3Aissue+milestone%3A1.1)
+[1.1 - June 2017](https://github.com/Microsoft/WindowsTemplateStudio/issues?utf8=%E2%9C%93&q=is%3Aissue%20milestone%3A1.1%20)
 
-**Goals:** Refactor how we handle Code-behind, add new features and pages to templates, bug fixes and lets see what the community asks for!
+* Improvements to the Wizard:
+   * Page Reordering
+   * The first page doesn’t have to be the Blank page
+   * Renaming of pages and background tasks
+   * Offline improvements
+   * Initial work for supporting localization
+   * Code analysis was added
+* Page updates:
+   * Grid page added
+   * Chart page added
+   * Media/Video page added
+   * Web View page has been enhanced
+* Feature updates:
+   * Store SDK Notifications added
+   * SettingStorage now has a binary save option (not just string based)
+* Template improvements:
+   * Navigation panel moved to UWP Community Toolkit
+   * Styling adjustments
+   * ResourceLoader perf improvement
 
-## Future Release [Backlog]
+## Upcoming releases
 
-[Features without assigned releases](https://github.com/Microsoft/WindowsTemplateStudio/issues?q=is%3Aopen+is%3Aissue+milestone%3ABacklog)
+[1.2 - July 2017](https://github.com/Microsoft/WindowsTemplateStudio/issues?q=is%3Aopen+is%3Aissue+milestone%3A1.2)
 
-## Old releases
+**Goals:** Right click add, Localization work, accessibilty work
 
-### 0.5 Release
+[1.3 - August 2017](https://github.com/Microsoft/WindowsTemplateStudio/issues?q=is%3Aopen+is%3Aissue+milestone%3A1.3)
 
-[0.5 - April 30th, 2017](https://github.com/Microsoft/WindowsTemplateStudio/issues?q=is%3Aopen+is%3Aissue+milestone%3A0.5)
+**Goals:** Localization work, accessibilty work
 
-**Goals:** Code behind, improved wizard experience, stability
-
-### 1.0 Release
+## Future Release [Backlog]
 
-[1.0 - May 11th, 2017](https://github.com/Microsoft/WindowsTemplateStudio/issues?q=is%3Aopen+is%3Aissue+milestone%3A1.0)
+[Features without assigned releases](https://github.com/Microsoft/WindowsTemplateStudio/issues?q=is%3Aopen+is%3Aissue+milestone%3ABacklog)
 
-**Goals:** Stability
+## Old releases
+* [0.5 - April 30th, 2017](https://github.com/Microsoft/WindowsTemplateStudio/issues?q=is%3Aopen+is%3Aissue+milestone%3A0.5)
+* [1.0 - May 11th, 2017](https://github.com/Microsoft/WindowsTemplateStudio/issues?q=is%3Aopen+is%3Aissue+milestone%3A1.0)
+* [1.0.17142.1 Release](https://github.com/Microsoft/WindowsTemplateStudio/issues?q=is%3Aopen+is%3Aissue+milestone%3A%221.01+-+Critical+Bug+Fixes%22)
+    * [#277](https://github.com/Microsoft/WindowsTemplateStudio/issues/277): Templates download in background
+    * [#311](https://github.com/Microsoft/WindowsTemplateStudio/issues/311): Initial offline support for wizard (templates shipped w/ VSIX)
+    * [#326](https://github.com/Microsoft/WindowsTemplateStudio/issues/326): Clicking OK on Toast Notification restarts app
+    * [#327](https://github.com/Microsoft/WindowsTemplateStudio/issues/327): Prior Windows SDK no longer a requirement
+    * [#329](https://github.com/Microsoft/WindowsTemplateStudio/issues/329): Build Errors - must add a reference to assembly 'Windows, Version=255.255.255.255
+* [1.0.17137.1](https://github.com/Microsoft/WindowsTemplateStudio/issues?q=is%3Aopen+is%3Aissue+milestone%3A%221.01+-+Critical+Bug+Fixes%22)
+    * [#328](https://github.com/Microsoft/WindowsTemplateStudio/issues/328): Not compatible with Visual Studio Preview v15.3
+    * [#333](https://github.com/Microsoft/WindowsTemplateStudio/issues/333): Will not work if your TEMP folder is on a different drive to PROGRAMDATA
diff --git a/docs/telemetry.md b/docs/telemetry.md
@@ -4,6 +4,10 @@ Windows Template Studio wizard is ready to gather basic diagnostics telemetry an
 
 The class [`Diagnostics`](code/src/Core/Diagnostics)/[`TelemetryService`](../code/src/Core/Diagnostics/TelemetryService.cs), within the [Core](../code/src/Core) assembly, isolates the telemetry service implementation details and offer a smooth and easy way to invoke telemetry events. Just in case the telemetry backend needs / wants to be replaced, all the changes will be located at this class.
 
+## Trends
+
+Please head to our [Telemetry Data](telemetryData.md) where we show trends from the gathered telemetry.
+
 ## Telemetry Gathered
 
 The Wizard for Windows Template Studio collects basic diagnostics telemetry and usage data:
@@ -67,4 +71,4 @@ WindowsTemplateStudio.config.json
   "DiagnosticsTraceLevel": "Warning"
 }
 
-```
+```
diff --git a/docs/telemetryData.md b/docs/telemetryData.md
@@ -0,0 +1,39 @@
+# Telemetry for Windows Template Studio - 2017.06
+
+## Project Type
+
+|Project|Percentage|Change %|
+|:---|:---:|:---|
+|Navigation View|74.2%|-|
+|Tabbed / Pivot|15.4%|-|
+|Blank|10.4%|-|
+
+## Framework
+
+|Framework Type|Percentage|Change %|
+|:---|:---:|:---|
+|CodeBehind|45.0%|-|
+|MVVM Light|29.0%|-|
+|MVVM Basic|26.0%|-|
+
+## Framework
+
+|Pages|Percentage|Change %|
+|:---|:---:|:---|
+|Blank|47.8%|-|
+|Settings|15.5%|-|
+|Master/Detail|15.4%|-|
+|Tabbed|9.2%|-|
+|Web View|6.3%|-|
+|Map|5.8%|-|
+
+## Features
+
+|Pages|Percentage|Change %|
+|:---|:---:|:---|
+|Settings Storage|33.8%|-|
+|Suspend and Resume|19.2%|-|
+|Toast Notifications|16.5%|-|
+|Live Tile|15.6%|-|
+|Background Task|10.2%|-|
+|Azure Notification Hub|4.7%|-|
diff --git a/templates/Features/StoreNotifications/.template.config/description.md b/templates/Features/StoreNotifications/.template.config/description.md
@@ -1,3 +1,3 @@
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+Engaging with your customers at the right time and with the right message is key to your success as an app developer. Windows Dev Center provides a data-driven customer engagement platform you can use to send notifications to all of your customers, or only targeted to a subset of your Windows 10 customers who meet the criteria you’ve defined in a customer segment.
 
-To find out more about Store Notifications, head to [docs.microsoft.com](https://docs.microsoft.com/windows/uwp/monetize/configure-your-app-to-receive-dev-center-notifications).
+To find out more about Store Notifications, head to [docs.microsoft.com](https://docs.microsoft.com/windows/uwp/monetize/configure-your-app-to-receive-dev-center-notifications) for a broad overview of this feature or learn about [sending notifications to your app's customers](https://docs.microsoft.com/en-us/windows/uwp/publish/send-push-notifications-to-your-apps-customers).
diff --git a/templates/Features/StoreNotifications/.template.config/template.json b/templates/Features/StoreNotifications/.template.config/template.json
@@ -3,11 +3,11 @@
   "classifications": [
     "Universal"
   ],
-  "name": "Store Notification",
+  "name": "Dev Center Notification",
   "groupIdentity": "wts.Feat.StoreNotifications",
   "identity": "wts.Feat.StoreNotifications",
   "shortName": "Store Notifications",
-  "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+  "description": "Engage directly with all or a targeted segment of your customers with adaptive and interactive notifications.",
   "tags": {
     "language": "C#",
     "type": "item",

diff --git a/templates/_composition/CodeBehind/Project.SplitView/Views/ShellPage.xaml.cs b/templates/_composition/CodeBehind/Project.SplitView/Views/ShellPage.xaml.cs
@@ -15,6 +15,8 @@ public sealed partial class ShellPage : Page, INotifyPropertyChanged
         private const string PanoramicStateName = "PanoramicState";
         private const string WideStateName = "WideState";
         private const string NarrowStateName = "NarrowState";
+        private const double WideStateMinWindowWidth = 640;
+        private const double PanoramicStateMinWindowWidth = 1024;
 
         private bool _isPaneOpen;
         public bool IsPaneOpen
@@ -59,10 +61,23 @@ private void Initialize()
             NavigationService.Frame.Navigated += NavigationService_Navigated;
             PopulateNavItems();
 
-            if (Window.Current.Bounds.Width < 640)
+            InitializeState(Window.Current.Bounds.Width);
+        }
+
+        private void InitializeState(double windowWith)
+        {
+            if (windowWith < WideStateMinWindowWidth)
             {
                 GoToState(NarrowStateName);
             }
+            else if (windowWith < PanoramicStateMinWindowWidth)
+            {
+                GoToState(WideStateName);
+            }
+            else
+            {
+                GoToState(PanoramicStateName);
+            }
         }
 
         private void PopulateNavItems()

diff --git a/templates/_composition/MVVMBasic/Project.SplitView/ViewModels/ShellViewModel.cs b/templates/_composition/MVVMBasic/Project.SplitView/ViewModels/ShellViewModel.cs
@@ -15,6 +15,8 @@ public class ShellViewModel : Observable
         private const string PanoramicStateName = "PanoramicState";
         private const string WideStateName = "WideState";
         private const string NarrowStateName = "NarrowState";
+        private const double WideStateMinWindowWidth = 640;
+        private const double PanoramicStateMinWindowWidth = 1024;
 
         private bool _isPaneOpen;
         public bool IsPaneOpen
@@ -88,6 +90,22 @@ public ICommand StateChangedCommand
             }
         }
 
+        private void InitializeState(double windowWith)
+        {
+            if (windowWith < WideStateMinWindowWidth)
+            {
+                GoToState(NarrowStateName);
+            }
+            else if (windowWith < PanoramicStateMinWindowWidth)
+            {
+                GoToState(WideStateName);
+            }
+            else
+            {
+                GoToState(PanoramicStateName);
+            }
+        }
+
         private void GoToState(string stateName)
         {
             switch (stateName)
@@ -114,10 +132,7 @@ public void Initialize(Frame frame)
             NavigationService.Frame.Navigated += NavigationService_Navigated;
             PopulateNavItems();
 
-            if (Window.Current.Bounds.Width < 640)
-            {
-                GoToState(NarrowStateName);
-            }
+            InitializeState(Window.Current.Bounds.Width);
         }
 
         private void PopulateNavItems()

diff --git a/templates/_composition/MVVMLight/Project.SplitView/ViewModels/ShellViewModel.cs b/templates/_composition/MVVMLight/Project.SplitView/ViewModels/ShellViewModel.cs
@@ -18,6 +18,8 @@ public class ShellViewModel : ViewModelBase
         private const string PanoramicStateName = "PanoramicState";
         private const string WideStateName = "WideState";
         private const string NarrowStateName = "NarrowState";
+        private const double WideStateMinWindowWidth = 640;
+        private const double PanoramicStateMinWindowWidth = 1024;
 
         public NavigationServiceEx NavigationService
         {
@@ -125,10 +127,23 @@ public void Initialize(Frame frame)
             NavigationService.Frame.Navigated += NavigationService_Navigated;
             PopulateNavItems();
 
-            if (Window.Current.Bounds.Width < 640)
+            InitializeState(Window.Current.Bounds.Width);
+        }
+
+        private void InitializeState(double windowWith)
+        {
+            if (windowWith < WideStateMinWindowWidth)
             {
                 GoToState(NarrowStateName);
             }
+            else if (windowWith < PanoramicStateMinWindowWidth)
+            {
+                GoToState(WideStateName);
+            }
+            else
+            {
+                GoToState(PanoramicStateName);
+            }
         }
 
         private void PopulateNavItems()

diff --git a/....AddAdaptiveTriggerForPageTitle_Blank_Settings_TabbedPivot/.template.config/template.json b/....AddAdaptiveTriggerForPageTitle_Blank_Settings_TabbedPivot/.template.config/template.json
@@ -9,7 +9,7 @@
     "type": "item",
     "wts.type": "composition",
     "wts.version": "1.0.0",
-    "wts.compositionFilter": "$projectType == SplitView & groupidentity == wts.Page.Blank|wts.Page.Settings|wts.Page.TabbedPivot"
+    "wts.compositionFilter": "$projectType == SplitView & groupidentity == wts.Page.Blank|wts.Page.Settings|wts.Page.TabbedPivot|wts.Page.Chart"
   },
   "sourceName": "wts.ItemName",
   "preferNameDirectory": true,