Merge branch 'microsoft:main' into impAccessibilityLevel

Author: vineethkuttan

.ado/jobs/playground.yml

@@ -42,14 +42,6 @@ parameters:
             BuildConfiguration: Release
             BuildPlatform: x64
             SolutionFile: Playground-Composition.sln
-          - Name: X86DebugWin32
-            BuildConfiguration: Debug
-            BuildPlatform: x86
-            SolutionFile: Playground-Win32.sln
-          - Name: X64ReleaseWin32
-            BuildConfiguration: Release
-            BuildPlatform: x64
-            SolutionFile: Playground-Win32.sln
       - BuildEnvironment: SecurePullRequest
         Matrix:
           - Name: X86DebugCompositionExperimentalWinUI3
@@ -104,14 +96,6 @@ parameters:
             BuildPlatform: x64
             SolutionFile: Playground-Composition.sln
             UseExperimentalWinUI3: true
-          - Name: X86DebugWin32
-            BuildConfiguration: Debug
-            BuildPlatform: x86
-            SolutionFile: Playground-Win32.sln
-          - Name: X64ReleaseWin32
-            BuildConfiguration: Release
-            BuildPlatform: x64
-            SolutionFile: Playground-Win32.sln
 
 jobs:
   - ${{ each config in parameters.buildMatrix }}:

change/react-native-windows-2b67676a-4ae8-407a-9c38-e8fec7b38b42.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Update WindowsAppSDK version to 1.7.250401001",
+  "packageName": "react-native-windows",
+  "email": "30809111+acoates-ms@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

packages/playground/.gitignore

@@ -93,4 +93,3 @@ packages/
 
 windows/playground/Bundle
 windows/playground-composition/Bundle
-windows/playground-win32/Bundle

packages/playground/OpenWinUI3Win32PG.ps1

@@ -22,43 +22,6 @@ Use the UI at the top of the playground application to modify the instance setti
 6. On the target, press `Load`. This will communicate back to the dev machine bundler and launch the web debugger on the dev machine, and serve the pages back to the app running in the target.
    You need an updated version of the bundler in order for remote debugging to work properly: [PR here](https://github.com/react-native-community/cli/pull/829)
 
-# Playground-win32
-
-Playground-win32 is a sample of an RNW application using XAML Islands that allows testing of various JS files, including RNTester.
-
-## Using the app
-
-You can find several sample .tsx files under the `/playground/samples` folder. You can load any of these files by selecting the "File" menu, then "Open Javascript File", and then clicking on the sample you wish to open.
-
-# Launching and Editing
-## Launching the app
-
-1. Make sure your development machine has been set up with all the system requirements and dependencies mentioned [here](https://microsoft.github.io/react-native-windows/docs/next/rnw-dependencies). Make sure a browser is launched and running.
-
-1. Install Packages with-in the repo
-
-`yarn`
-
-1. Ensure packages are built
-
-`yarn build`
-
-1. Navigate to the `playground` folder
-
-`cd packages\playground`
-
-1. Start Metro
-
-`yarn start`
-
-1. Open the app solution file in Visual Studio either `windows\playground.sln` or `windows\playground-win32.sln` 
-
-1. Set the build configuration to "Debug" and Platform to "x86" or "x64"
-
-1. Hit "Local Windows Debugger"
-
-This will build and deploy the application and the dev tools.
-
 ## Editing the app
 
 You can access and edit the .tsx files in the `/playground/samples` folder. Fast Refresh should work as expected while editing the Typescript files.

packages/playground/README.md

@@ -5,14 +5,9 @@
  * @ts-check
  */
 
-const fs = require('fs');
 const {parallel, series, task} = require('just-scripts');
 
 // Use the shared base configuration
 require('@rnw-scripts/just-task');
 
-task('prepareBundleWin32', () => {
-  fs.mkdirSync('windows/playground-win32/Bundle/Samples', {recursive: true});
-});
-
 task('lint', parallel(series('prettier', 'eslint'), 'depcheck', 'ts'));

packages/playground/just-task.js

@@ -3,7 +3,6 @@
   "version": "0.0.54",
   "private": true,
   "scripts": {
-    "bundle-win32": "rnw-scripts prepareBundleWin32 && npx @react-native-community/cli bundle --entry-file Samples/rntester.tsx --bundle-output windows/playground-win32/Bundle/Samples/rntester.bundle --platform windows --assets-dest windows/playground-win32/Bundle",
     "start": "npx @react-native-community/cli start",
     "lint:fix": "rnw-scripts lint:fix",
     "lint": "rnw-scripts lint",
@@ -40,4 +39,4 @@
   "engines": {
     "node": ">= 18"
   }
-}
+}

packages/playground/package.json

@@ -1,14 +1,14 @@
-// Change the below to true for autolink to target playground-win32 instead of playground.
+// Change the below to true for autolink to target playground-composition instead of playground.
 // Then run `npx @react-native-community/cli autolink-windows` to actually run the autolink.
-const targetWin32 = true;
+const targetComposition = true;
 
 module.exports = {
   project: {
     windows: {
       sourceDir: 'windows',
-      solutionFile: targetWin32 ? 'playground-win32.sln' : 'playground.sln',
+      solutionFile: targetComposition ? 'playground-composition.sln' : 'playground.sln',
       project: {
-        projectFile: targetWin32 ? 'playground-win32\\playground-win32.vcxproj' : 'playground\\playground.vcxproj',
+        projectFile: targetComposition ? 'playground-composition\\playground-composition.vcxproj' : 'playground\\playground.vcxproj',
       },
     },
   },

packages/playground/react-native.config.js

@@ -8,15 +8,6 @@
     <ReactExperimentalFeaturesSet>true</ReactExperimentalFeaturesSet>
   </PropertyGroup>
 
-  <PropertyGroup Label="Unpackaged playground-win32" Condition="'$(SolutionName)'=='playground-win32' OR '$(SolutionName)'=='playground-composition'">
-    <!--
-      WARNING - DO NOT MAKE THE VERSION OF MICROSOFT.UI.XAML BE ANYTHING BUT PRERELEASE.
-      Playground-Win32 is an unpackaged win32 app, and needs to use Microsoft.UI.Xaml from a prerelease,
-      to be able to carry WinUI in-app instead of using the Framework Package
-    -->
-    <WinUI2xVersion>2.7.0-prerelease.210913003</WinUI2xVersion>
-  </PropertyGroup>
-
   <PropertyGroup Label="WinUI3 for fabric" Condition="'$(SolutionName)'=='playground-composition'">
     <RnwNewArch>true</RnwNewArch>
     <UseExperimentalNuget>false</UseExperimentalNuget>