Merge branch 'main' into drewbat/settings-backup-restore

Author: drewbatgit

.openpublishing.redirection.json

@@ -7719,6 +7719,11 @@
       "source_path": "hub/apps/develop/settings/index.md",
       "redirect_url": "/windows/apps/develop/settings/settings-windows-11",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "hub/dev-environment/javascript/windows-or-wsl.md",
+      "redirect_url": "hub/dev-environment/javascript/nodejs-overview.md",
+      "redirect_document_id": false
     }
   ]
 }

hub/android/wsa/index.md

@@ -6,13 +6,18 @@ ms.author: mattwoj
 ms.reviewer: mousma
 manager: jken
 ms.topic: article
-ms.date: 06/06/2023
+ms.date: 03/05/2024
 ---
 
 # Windows Subsystem for Android™️
 
 Windows Subsystem for Android™️ enables your Windows 11 device to run Android applications that are available in the Amazon Appstore. Android is a trademark of Google LLC. If you're a developer interested in targeting Windows desktop devices and optimizing for the Windows operating system, this guide is for you.
 
+> [!IMPORTANT]
+> Microsoft is ending support for the Windows Subsystem for Android™️ (WSA). As a result, the Amazon Appstore on Windows and all applications and games dependent on WSA will no longer be supported beginning **March 5, 2025**. Until then, technical support will remain available to customers.  
+> Customers that have installed the Amazon Appstore or Android apps prior to March 5, 2024, will continue to have access to those apps through the deprecation date of March 5, 2025. Please reach out to our support team for further questions at [support.microsoft.com](https://support.microsoft.com).
+> We are grateful for the support of our developer community and remain committed to listening to feedback as we evolve experiences.
+
 To make your Android app available on Windows 11 devices, you must:
 
 - [Submit your app to the Amazon Appstore](https://developer.amazon.com/apps-and-games/appstore-on-windows-11).

hub/android/wsa/preview-program.md

@@ -6,11 +6,14 @@ ms.author: mousma
 ms.reviewer: mattwojo
 manager: aleader
 ms.topic: article
-ms.date: 03/07/2022
+ms.date: 03/05/2024
 ---
 
 # Windows Subsystem for Android™️ Preview Program
 
+> [!IMPORTANT]
+> Windows Subsystem for Android™️ and the Amazon Appstore will no longer be available in the Microsoft Store after March 5, 2025. [Learn more](index.md).
+
 The Windows Subsystem for Android™️ Preview Program allows users to receive early-preview builds of the Windows Subsystem for Android™ and Amazon Appstore on Windows. Installing the Amazon Appstore on Windows automatically installs Windows Subsystem for Android™️. Learn more about [installing the Amazon Appstore](https://support.microsoft.com/en-us/windows/install-mobile-apps-and-the-amazon-appstore-f8d0abb5-44ad-47d8-b9fb-ad6b1459ff6c).
 
 > [!NOTE]

hub/android/wsa/release-notes.md

@@ -6,11 +6,14 @@ ms.author: mattwoj
 ms.reviewer: mousma
 manager: jken
 ms.topic: article
-ms.date: 03/15/2023
+ms.date: 03/05/2024
 ---
 
 # Release Notes for Windows Subsystem for Android™️
 
+> [!IMPORTANT]
+> Windows Subsystem for Android™️ and the Amazon Appstore will no longer be available in the Microsoft Store after March 5, 2025. [Learn more](index.md).
+
 These release notes are based on updates to the Windows Subsystem for Android™️. For basic information on how to install and run Android™️ apps on Windows, see the Support article: [Installing the Amazon Appstore and Android™️ Apps](https://support.microsoft.com/windows/mobile-apps-and-the-windows-subsystem-for-android-f8d0abb5-44ad-47d8-b9fb-ad6b1459ff6c).
 
 ## Build 2304.40000.3.0

hub/apps/design/controls/command-bar-flyout.md

@@ -13,7 +13,7 @@ ms.custom: RS5
 
 The command bar flyout lets you provide users with easy access to common tasks by showing commands in a floating toolbar related to an element on your UI canvas.
 
-![An expanded text command bar flyout](images/command-bar-flyout-text-full.png)
+![An expanded text proofing command bar flyout](images/command-bar-flyout-text-full-1-5.png)
 
 Like [CommandBar](command-bar.md), CommandBarFlyout has **PrimaryCommands** and **SecondaryCommands** properties you can use to add commands. You can place commands in either collection, or both. When and how the primary and secondary commands are displayed depends on the display mode.
 
@@ -79,18 +79,19 @@ This example shows how to create a command bar flyout and use it both proactivel
 <Grid>
     <Grid.Resources>
         <CommandBarFlyout x:Name="ImageCommandsFlyout">
-            <AppBarButton Icon="OutlineStar" ToolTipService.ToolTip="Favorite"/>
-            <AppBarButton Icon="Copy" ToolTipService.ToolTip="Copy"/>
-            <AppBarButton Icon="Share" ToolTipService.ToolTip="Share"/>
+            <AppBarButton Label="Favorite" Icon="OutlineStar" ToolTipService.ToolTip="Favorite"/>
+            <AppBarButton Label="Copy" Icon="Copy" ToolTipService.ToolTip="Copy"/>
+            <AppBarButton Label="Share" Icon="Share" ToolTipService.ToolTip="Share"/>
             <CommandBarFlyout.SecondaryCommands>
-                <AppBarButton Label="Select all"/>
+                <AppBarButton Label="Rotate" Icon="Rotate"/>
                 <AppBarButton Label="Delete" Icon="Delete"/>
             </CommandBarFlyout.SecondaryCommands>
         </CommandBarFlyout>
     </Grid.Resources>
 
     <Image Source="Assets/image1.png" Width="300"
-           Tapped="Image_Tapped" FlyoutBase.AttachedFlyout="{x:Bind ImageCommandsFlyout}"
+           Tapped="Image_Tapped" 
+           FlyoutBase.AttachedFlyout="{x:Bind ImageCommandsFlyout}"
            ContextFlyout="{x:Bind ImageCommandsFlyout}"/>
 </Grid>
 ```
@@ -112,11 +113,11 @@ private void Image_Tapped(object sender, TappedRoutedEventArgs e)
 
 Here's the command bar flyout in its collapsed state.
 
-![Example of a collapsed command bar flyout](images/command-bar-flyout-img-collapsed.png)
+![Example of a collapsed command bar flyout](images/command-bar-flyout-img-collapsed-1-5.png)
 
 Here's the same command bar flyout in its expanded state showing secondary commands.
 
-![Example of an expanded command bar flyout](images/command-bar-flyout-img-expanded.png)
+![Example of an expanded command bar flyout](images/command-bar-flyout-img-expanded-1-5.png)
 
 ### Show commands proactively
 
@@ -164,7 +165,11 @@ You can populate the PrimaryCommands and SecondaryCommands directly with [AppBar
 
 The app bar button controls are characterized by an icon and text label. These controls are optimized for use in a command bar, and their appearance changes depending on whether the control is shown in the command bar or the overflow menu.
 
-- App bar buttons used as primary commands are shown in the command bar with only their icon; the text label is not shown. We recommend that you use a [tooltip](tooltips.md) to show a text description of the command, as shown here.
+- **In Windows App SDK 1.5 and later:** App bar buttons used as primary commands are shown in the command bar with both the text label and icon (if both are set).
+    ```xaml
+    <AppBarButton Icon="Copy" Label="Copy"/>
+    ```
+- **In Windows App SDK 1.4 and earlier:** App bar buttons used as primary commands are shown in the command bar with only their icon; the text label is not shown. We recommend that you use a [tooltip](tooltips.md) to show a text description of the command, as shown here.
     ```xaml
     <AppBarButton Icon="Copy" ToolTipService.ToolTip="Copy"/>
     ```
@@ -186,7 +191,7 @@ You can add other controls to a command bar flyout by wrapping them in an AppBar
 
 In order to be added to the primary or secondary command collections of a command bar flyout, an element must implement the [ICommandBarElement](/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.icommandbarelement) interface. [AppBarElementContainer](/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.appbarelementcontainer) is a wrapper that implements this interface so you can add an element to a command bar even if it doesn't implement the interface itself.
 
-Here, an AppBarElementContainer is used to add extra elements to a command bar flyout. A SplitButton is added to the primary commands to allow selection of colors. A StackPanel is added to the secondary commands to allow a more complex layout for zoom controls.
+Here, an AppBarElementContainer is used to add extra elements to a command bar flyout. A SplitButton is added to the primary commands to enable text alignment. A StackPanel is added to the secondary commands to allow a more complex layout for zoom controls.
 
 > [!TIP]
 > By default, elements designed for the app canvas might not look right in a command bar. When you add an element using AppBarElementContainer, there are some steps you should take to make the element match other command bar elements:
@@ -200,9 +205,9 @@ Here, an AppBarElementContainer is used to add extra elements to a command bar f
 
 ```xaml
 <CommandBarFlyout>
-    <AppBarButton Icon="Cut" ToolTipService.ToolTip="Cut"/>
-    <AppBarButton Icon="Copy" ToolTipService.ToolTip="Copy"/>
-    <AppBarButton Icon="Paste" ToolTipService.ToolTip="Paste"/>
+    <AppBarButton Icon="Cut" Label="Cut" ToolTipService.ToolTip="Cut"/>
+    <AppBarButton Icon="Copy" Label="Copy" ToolTipService.ToolTip="Copy"/>
+    <AppBarButton Icon="Paste" Label="Paste" ToolTipService.ToolTip="Paste"/>
     <!-- Alignment controls -->
     <AppBarElementContainer>
          <SplitButton ToolTipService.ToolTip="Alignment">
@@ -302,11 +307,11 @@ Here, an AppBarElementContainer is used to add extra elements to a command bar f
 
 Here's the collapsed command bar flyout with an open SplitButton.
 
-![A command bar flyout with a split button](images/command-bar-flyout-split-button.png)
+![A command bar flyout with a split button](images/command-bar-flyout-split-button-1-5.png)
 
 Here's the expanded command bar flyout with custom zoom UI in the menu.
 
-![A command bar flyout with complex UI](images/command-bar-flyout-custom-ui.png)
+![A command bar flyout with complex UI](images/command-bar-flyout-custom-ui-1-5.png)
 
 ## Create a context menu with secondary commands only