Windows 10 RTM Release - November 2015 Update 2

yulei-li · Nov 24, 2015 · 0b2568a · 0b2568a
1 parent 2d38b5d
commit 0b2568a
Show file tree

Hide file tree

Showing 7 changed files with 319 additions and 455 deletions.
diff --git a/Samples/CortanaVoiceCommand/cs/AdventureWorks/App.xaml.cs b/Samples/CortanaVoiceCommand/cs/AdventureWorks/App.xaml.cs
@@ -46,6 +46,7 @@ public App()
         /// </summary>
         public static NavigationService NavigationService { get; private set; }
 
+        private RootFrameNavigationHelper rootFrameNavigationHelper;
 
         /// <summary>
         /// Invoked when the application is launched normally by the end user.  Other entry points
@@ -65,6 +66,9 @@ protected async override void OnLaunched(LaunchActivatedEventArgs e)
                 rootFrame = new Frame();
                 App.NavigationService = new NavigationService(rootFrame);
 
+                // Use the RootFrameNavigationHelper to respond to keyboard and mouse shortcuts.
+                this.rootFrameNavigationHelper = new RootFrameNavigationHelper(rootFrame);
+
                 rootFrame.NavigationFailed += OnNavigationFailed;
 
                 // Place the frame in the current Window

diff --git a/Samples/CortanaVoiceCommand/cs/AdventureWorks/Common/NavigationHelper.cs b/Samples/CortanaVoiceCommand/cs/AdventureWorks/Common/NavigationHelper.cs
diff --git a/Samples/FolderEnumeration/cs/Package.appxmanifest b/Samples/FolderEnumeration/cs/Package.appxmanifest
@@ -21,7 +21,7 @@
     </Properties>
 
     <Dependencies>
-        <TargetDeviceFamily Name="Windows.Mobile" MinVersion="10.0.10240.0" MaxVersionTested="10.0.10240.0" />
+        <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.10240.0" MaxVersionTested="10.0.10240.0" />
     </Dependencies>
 
     <Resources>

diff --git a/Samples/TouchKeyboard/cpp/Package.appxmanifest b/Samples/TouchKeyboard/cpp/Package.appxmanifest
@@ -20,7 +20,7 @@
     </Properties>
 
     <Dependencies>
-        <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.10240.0" MaxVersionTested="10.0.10240.0" />
+        <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.10240.0" MaxVersionTested="10.0.10240.0" />
     </Dependencies>
 
     <Resources>

diff --git a/Samples/TouchKeyboard/cs/Package.appxmanifest b/Samples/TouchKeyboard/cs/Package.appxmanifest
@@ -21,7 +21,7 @@
     </Properties>
 
     <Dependencies>
-        <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.10240.0" MaxVersionTested="10.0.10240.0" />
+        <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.10240.0" MaxVersionTested="10.0.10240.0" />
         <PackageDependency Name="Microsoft.VCLibs.140.00" MinVersion="14.0.0.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
     </Dependencies>