Merge branch 'main' into alvinashcraft-main-powertoys-add-zoomit-v087

alvinashcraft · alvinashcraft · commit f799ab030602 · 2024-12-17T09:20:24.000-05:00
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -8639,9 +8639,11 @@
       "source_path": "hub/android/defender-settings.md",
       "redirect_url": "/defender-endpoint/microsoft-defender-security-center-antivirus",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "hub/apps/get-started/client-frameworks-faq.yml",
+      "redirect_url": "/windows/apps/get-started/windows-developer-faq",
+      "redirect_document_id": false
     }
   ]
 }
-
-
-
diff --git a/hub/apps/get-started/client-frameworks-faq.yml b/hub/apps/get-started/client-frameworks-faq.yml
diff --git a/hub/apps/get-started/index.md b/hub/apps/get-started/index.md
@@ -64,7 +64,7 @@ WPF is a well-established framework for Windows desktop applications with access
 Additionally, you can now integrate a sandbox environment into your packaged WPF applications, providing an additional layer of security. This enhancement requires little to no change to your code, thanks to the new [Win32 App Isolation](https://github.com/microsoft/win32-app-isolation) security feature.
 
 > [!TIP]
-> If you've already invested in WPF, you can continue to use it and take advantage of the modernization options in .NET 9. You can build your apps knowing that Microsoft is continuing to invest in WPF. See the [Client app development framework FAQ](client-frameworks-faq.yml) for more information.
+> If you've already invested in WPF, you can continue to use it and take advantage of the modernization options in .NET 9. You can build your apps knowing that Microsoft is continuing to invest in WPF. See the [Windows developer FAQ](windows-developer-faq.yml) for more information.
 
 > [!div class="button"]
 > [Get started with WPF](/dotnet/desktop/wpf/overview/)
@@ -206,7 +206,7 @@ There is a wide range of options for developing applications for Windows. The be
 
 Learn more about each of these options:
 
-- [Client app development framework FAQ](client-frameworks-faq.yml)
+- [Windows developer FAQ](windows-developer-faq.yml)
 - [.NET Multi-platform App UI (.NET MAUI)](/dotnet/maui/)
 - [ASP.NET Core Blazor Hybrid](/aspnet/core/blazor/hybrid)
 - [React Native for Desktop](/windows/dev-environment/javascript/react-native-for-windows)
diff --git a/hub/apps/get-started/windows-developer-faq.yml b/hub/apps/get-started/windows-developer-faq.yml
diff --git a/hub/apps/get-started/windows-developer-glossary.md b/hub/apps/get-started/windows-developer-glossary.md
@@ -2,7 +2,7 @@
 title: Windows developer glossary
 description:  A glossary of terms related to Windows application development.
 ms.topic: article
-ms.date: 08/19/2024
+ms.date: 12/16/2024
 ms.localizationpriority: medium
 ms.collection: windows11
 audience: new-desktop-app-developers
@@ -14,101 +14,157 @@ content-type: glossary
 The following glossary of terms is meant to promote a common vocabulary among Windows developers.
 
 #### App lifecycle management (ALM)
+
 Describes the management of your application's execution state: not running, running in background, running in foreground, suspended, and so on. See [Windows 10 universal Windows platform (UWP) app lifecycle](/windows/uwp/launch-resume/app-lifecycle).
 
 #### Application model
+
 Often referred to as "app model". The combination of deployment, isolation, lifecycle, and presentation components that are unique to a given application development technology. For example: Windows App SDK / WinUI 3 apps run on the Win32 app model, while UWP / WinUI 2 run on the UWP app model.
 
 #### Application packaging
+
 Describes the way in which your app is packaged before being deployed and installed by users. An app can be packaged, unpackaged, or packaged with external location (see the [Windows developer FAQ](/windows/apps/get-started/windows-developer-faq#what-s-the-difference-between-apps-that-are-packaged--unpackaged--and-packaged-with-external-location)).
 
 #### Bootstrapper
-A redistributable component providing an API to find and load the Windows App SDK framework package for the calling process. In a packaged with external location or unpackaged app, you can opt to load the Windows App SDK framework package explicitly by calling Bootstrapper APIs such as [**MddBootstrapInitialize**](/windows/windows-app-sdk/api/win32/mddbootstrap/nf-mddbootstrap-mddbootstrapinitialize). Also see [Reference the Windows App SDK framework package at run time](../windows-app-sdk/use-windows-app-sdk-run-time.md).
+
+A redistributable component providing an API to find and load the Windows App SDK framework package for the calling process. In a packaged with external location or unpackaged app, you can opt to load the Windows App SDK framework package explicitly by calling Bootstrapper APIs such as [MddBootstrapInitialize](/windows/windows-app-sdk/api/win32/mddbootstrap/nf-mddbootstrap-mddbootstrapinitialize). Also see [Reference the Windows App SDK framework package at run time](../windows-app-sdk/use-windows-app-sdk-run-time.md).
 
 #### C++/WinRT
+
 C++/WinRT is a standard C++17 language projection for Windows Runtime (WinRT) APIs, implemented as a header-file-based library, and designed to provide you with first-class access to modern Windows APIs. [C++/WinRT](/windows/uwp/cpp-and-winrt-apis/).
 
 #### Dynamic Dependencies
+
 [Dynamic Dependencies](https://github.com/microsoft/WindowsAppSDK/blob/main/specs/dynamicdependencies/DynamicDependencies.md) makes framework packages accessible to all kinds of apps: packaged and unpackaged.
 
 #### Fluent Design
-[Fluent Design](https://aka.ms/fluent) is a design system that lets you create reusable cross-platform user interfaces. 
+
+[Fluent Design](https://aka.ms/fluent) is a design system that lets you create reusable cross-platform user experiences. Fluent 2 is the latest design system for Windows and is used by WinUI.
+
+#### GitHub Copilot
+
+An AI pair programmer that helps you write code faster and with less work in Visual Studio or Visual Studio Code (VS Code). See [AI-assisted development in Visual Studio](/visualstudio/ide/ai-assisted-development-visual-studio) for more information.
 
 #### Hot Reload
+
 An app development feature that allows you to update your application's code and observe your changes while your application runs, eliminating the need to stop, rebuild, and re-run your apps while developing. See [Write and debug running code with Hot Reload](/visualstudio/debugger/hot-reload).
 
+#### Hybrid app
+
+An app that uses multiple technologies. For example, a .NET MAUI app that uses Blazor to render web content in a WebView2 control. See [ASP.NET Core Blazor Hybrid](/aspnet/core/blazor/hybrid/) for more information.
+
 #### Hybrid CRT linkage
+
 A C/C++ runtime library linkage technique that simplifies deployment. Also referred to simply as *Hybrid CRT*. See [Hybrid C/C++ runtime library linkage (hybrid CRT linkage)](../windows-app-sdk/migrate-to-windows-app-sdk/migrate-to-windows-app-sdk-ovw.md).
 
 #### Managed apps
+
 "Managed" refers to the "managed runtime" of .NET, which provides managed services such as garbage collection and security assurances. If you're building an app with .NET, you're building a managed app.
 
 #### Microsoft Foundation Classes (MFC)
+
 You can use Microsoft Foundation Classes (MFC) to create complex user interfaces with multiple controls. You can use MFC to create applications with Office-style user interfaces. See: [MFC desktop applications](/cpp/mfc/mfc-desktop-applications).
 
 #### MSIX (Microsoft Installer package format)
+
 MSIX is a Windows app package format that combines the best features of MSI, .appx, App-V, and ClickOnce to provide a modern and reliable packaging experience. It's a modern application package format that lets you easily deploy your Windows applications. MSIX can be used to package apps built using Windows App SDK, Win32, WPF, or Windows Forms. When you use MSIX to deploy your apps, your app is a *packaged* app. A packaged app can check for updates, and can control when updates are applied. [What is MSIX?](/windows/msix/overview).
 
 #### Native apps
+
 Traditionally, "native" refers to applications built without using the .NET runtime. In this case, "native" is synonymous with "unmanaged", and can be used to describe apps that manage their own memory and security concerns. Alternatively, some developers use "native" to indicate that an application has been built to run specifically on Windows, calling Windows APIs directly.
 
 #### .NET MAUI
-.NET Multi-platform App UI. A cross-platform framework for creating native mobile and desktop apps with C# and XAML. An evolution of `Xamarin.Forms` extended from mobile to desktop scenarios, with UI controls rebuilt from the ground up for performance and extensibility. [What is .NET MAUI?](/dotnet/maui/what-is-maui). 
+
+.NET Multi-platform App UI. A cross-platform framework for creating native mobile and desktop apps with C# and XAML. An evolution of `Xamarin.Forms` extended from mobile to desktop scenarios, with UI controls rebuilt from the ground up for performance and extensibility. [What is .NET MAUI?](/dotnet/maui/what-is-maui).
 
 #### Packaged app
+
 For definitions of apps that are packaged, unpackaged, and packaged with external location, see [Deployment overview](../package-and-deploy/index.md). That topic also explains the advantages and disadvantages of each option.
 
 #### Packaged app with external location
+
 For definitions of apps that are packaged, unpackaged, and packaged with external location, see [Deployment overview](../package-and-deploy/index.md). That topic also explains the advantages and disadvantages of each option.
 
+#### Progressive web app (PWA)
+
+An application that you build by using web technologies, and that can be installed and can run on all devices, from one codebase. See [Overview of Progressive Web Apps (PWAs)](/microsoft-edge/progressive-web-apps-chromium/) for more information about building PWAs.
+
 #### Project Reunion
+
 The codename for the Windows App SDK. No longer in use.
 
 #### React Native
-[React Native](https://reactnative.dev/) is a development platform from Meta which allows developers to build fully native cross-platform apps using JavaScript, TypeScript, and React. [React Native for Windows](https://aka.ms/reactnative) brings React Native support to the Windows 10 and Windows 11 SDKs, enabling developers to use JavaScript to build native Windows apps for all devices supported by Windows 10 and Windows 11. This includes PCs, tablets, 2-in-1s, Xbox, Mixed reality devices, etc.
+
+[React Native](https://reactnative.dev/) is a development platform from Meta which allows developers to build fully native cross-platform apps using JavaScript, TypeScript, and React.
+
+#### React Native for Desktop
+
+[React Native for Desktop](https://aka.ms/reactnative) brings React Native support to the Windows 10 and Windows 11 SDKs, enabling developers to use JavaScript to build native Windows apps for all devices supported by Windows 10 and Windows 11. This includes PCs, tablets, 2-in-1s, Xbox, Mixed reality devices, etc. The term React Native for Desktop encompasses both React Native for Windows and React Native for macOS.
+
+#### Responsible AI (RAI)
+
+A set of recommended responsible development practices to use as you create applications and features. See [Developing Responsible Generative AI Applications and Features on Windows](/windows/ai/rai/) to learn more about the RAI principles and how they apply to Windows development.
 
 #### Universal Windows Platform (UWP)
+
 An application development platform and application model that uses Windows Runtime (WinRT) APIs to deliver packaged apps. UWP apps run in a sandboxed environment, and they inherit the security of the UWP platform. [Learn more about UWP](/windows/uwp/).
 
+>[!NOTE]
+> The [preferred approach for writing Windows apps](/windows/apps/get-started/) is to use the Windows App SDK and [WinUI](/windows/apps/get-started/start-here). Another option is [WPF](/dotnet/desktop/wpf/getting-started).
+
 #### Unmanaged app
-Apps that aren't managed by the .NET runtime. If you're handling your own memory management, you're building an unmanaged app. 
+
+Apps that aren't managed by the .NET runtime. If you're handling your own memory management, you're building an unmanaged app.
 
 #### Unpackaged app
+
 For definitions of apps that are packaged, unpackaged, and packaged with external location, see [Deployment overview](../package-and-deploy/index.md). That topic also explains the advantages and disadvantages of each option.
 
 #### Visual Studio extension (VSIX)
+
 Lets you create, package, and deploy Visual Studio extensions. [Get started with the VSIX Project template](/visualstudio/extensibility/getting-started-with-the-vsix-project-template).
 
 #### WebView2
+
 A control that allows app developers to embed web content (HTML/CSS/JS) in their native apps using the Microsoft Edge (Chromium) rendering engine. You can use WebView2 in WinUI 3, Win32 C++, WPF, and WinForms, and it offers a developer preview for WinUI 2 / UWP support. See [Introduction to Microsoft Edge WebView2](/microsoft-edge/webview2/).
 
 #### Windows API
+
 Refers to the entire set of Windows APIs including Win32 APIs, COM APIs, UWP WinRT APIs, and the WinRT/Win32 APIs that are part of WinAppSDK and WinUI 3.
 
 #### Windows App SDK
+
 A set of new developer components and tools that represent the next evolution in the Windows app development platform. The successor to UWP / WinUI 2 for desktop application development. It lifts libraries from the OS into a standalone SDK that you can use to build backwards-compatible desktop apps. See [Overview of app development options](./index.md).
 
 #### Windows Forms
+
 Also known as WinForms. A UI framework for building Windows desktop applications. It is a .NET wrapper over Windows user interface libraries, such as User32 and GDI+. It's a battle-tested way to create desktop applications using a visual designer within Visual Studio. See [Desktop Guide (Windows Forms .NET)](/dotnet/desktop/winforms/overview/).
 
 #### Windows Presentation Foundation (WPF)
+
 A UI framework for building Windows desktop applications. WPF applications are based on a vector graphics architecture. This enables applications to look great on high DPI monitors, as they can be infinitely scaled. See [What is Windows Presentation Foundation (WPF)?](/visualstudio/designers/getting-started-with-wpf).
 
 #### Windows SDK
+
 The Windows SDK is a collection of headers, libraries, metadata, and tools that allow you to build desktop and UWP Windows apps. The Windows SDK is not the same as the [Windows App SDK](#windows-app-sdk).
 
 #### WinUI
-WinUI is the modern native user interface (UX) framework for both Windows desktop and UWP applications. [WinUI](../winui/index.md). 
+
+WinUI is the modern native user interface (UX) framework for both Windows desktop and UWP applications. [WinUI](../winui/index.md).
 
 #### WinUI 2
+
 WinUI 2 is tightly integrated with Windows SDKs, and provides official native Windows UI controls and other user interface elements for UWP applications (and desktop applications using XAML Islands). See [WinUI 2](../winui/winui2/index.md).
 
 #### WinUI 3
-The latest and recommended UI framework for Windows desktop apps. This framework is made available through the Windows App SDK, and has been decoupled from the Windows operating system. WinUI 3 uses [Fluent Design](https://aka.ms/fluent) to provide a native UX framework for Windows desktop apps. It will feel very familiar if you've worked with WinUI 2. See [WinUI 3](../winui/winui3/index.md).
+
+The latest and recommended UI framework for Windows desktop apps. This framework is made available through the Windows App SDK, and has been decoupled from the Windows operating system. WinUI 3 uses [Fluent Design](https://aka.ms/fluent) to provide a native UX framework for Windows desktop apps. It will feel very familiar if you've worked with WinUI 2. Note that WinUI 3 apps are commonly referred to as "WinUI apps". See [WinUI 3](../winui/winui3/index.md).
 
 #### XAML Islands
+
 XAML Islands lets you host WinRT XAML controls in non-UWP desktop (Win32, WinForms, WPF) apps starting in Windows 10, version 1903. [Host WinRT XAML controls in desktop apps (XAML Islands)](../desktop/modernize/xaml-islands/xaml-islands.md).
 
-## Related topics
-  - [Windows developer FAQ](windows-developer-faq.yml)
-  - [Overview of app development options](./index.md)
+## Related content
+
+- [Windows developer FAQ](windows-developer-faq.yml)
+- [Overview of app development options](./index.md)
diff --git a/hub/apps/how-tos/hello-world-winui3.md b/hub/apps/how-tos/hello-world-winui3.md
@@ -258,15 +258,16 @@ namespace Hello_World
 
 **Q: What does "packaged" mean?**
 
-Windows apps can be delivered to end-users using a variety of application packaging formats. When working with WinUI 3 / Windows App SDK, **packaged apps** use MSIX to bundle your app in a way that offers convenient installation and updates to end-users. Visit [Deployment architecture and overview for framework-dependent apps](../windows-app-sdk/deployment-architecture.md) to learn more.
+Windows apps can be delivered to end-users using a variety of application packaging formats. When working with WinUI and Windows App SDK, **packaged apps** use MSIX to bundle your app in a way that offers convenient installation and updates to end-users. Visit [Deployment architecture and overview for framework-dependent apps](../windows-app-sdk/deployment-architecture.md) to learn more.
 
-**Q: Can I use VS Code to build WinUI 3 apps?**
+**Q: Can I use VS Code to build WinUI apps?**
 
-Although technically possible, we strongly recommend using Visual Studio 2019 / 2022 to build desktop apps with WinUI 3 / Windows App SDK. See [the Windows developer FAQ](../get-started/windows-developer-faq.yml#do-i-need-to-use-visual-studio-to-build-winui-3-apps) for more information.
+Although technically possible, we strongly recommend using Visual Studio 2022 to build desktop apps with WinUI and Windows App SDK. See [the Windows developer FAQ](../get-started/windows-developer-faq.yml#do-i-need-to-use-visual-studio-to-build-winui-apps) for more information.
 
-**Q: Can I use C++ to build WinUI 3 apps?**
+**Q: Can I use C++ to build WinUI apps?**
 
 Yes! For more information, see [Introduction to C++/WinRT](/windows/uwp/cpp-and-winrt-apis/intro-to-using-cpp-with-winrt).
+
 ## Related
 
 - [Sample applications for Windows development](../get-started/samples.md)
diff --git a/hub/apps/toc.yml b/hub/apps/toc.yml
@@ -12,8 +12,6 @@ items:
       items: 
         - name: Overview of framework options
           href: get-started/index.md
-        - name: Client app development frameworks FAQ
-          href: get-started/client-frameworks-faq.yml
         - name: Start developing Windows apps
           href: get-started/start-here.md
         - name: Build your first app

Original file line number	Diff line number	Diff line change
`@@ -8639,9 +8639,11 @@`
`8639`	`8639`	`"source_path": "hub/android/defender-settings.md",`
`8640`	`8640`	`"redirect_url": "/defender-endpoint/microsoft-defender-security-center-antivirus",`
`8641`	`8641`	`"redirect_document_id": false`
	`8642`	`+ },`
	`8643`	`+ {`
	`8644`	`+ "source_path": "hub/apps/get-started/client-frameworks-faq.yml",`
	`8645`	`+ "redirect_url": "/windows/apps/get-started/windows-developer-faq",`
	`8646`	`+ "redirect_document_id": false`
`8642`	`8647`	`}`
`8643`	`8648`	`]`
`8644`	`8649`	`}`
`8645`		`-`
`8646`		`-`
`8647`		`-`