Merge branch 'microsoft:main' into impAccessibilityAnnotation2.0

Author: vineethkuttan

.ado/jobs/e2e-test.yml

@@ -84,6 +84,7 @@ jobs:
                 buildPlatform: ${{ matrix.BuildPlatform }}
                 buildLogDirectory: $(BuildLogDirectory)
                 workingDirectory: packages/e2e-test-app
+                errorOnNuGetLockChanges: false # Sometimes the content hashes of NuGet packages are wrong on VMs, workaround for later .NET versions don't work for UWP C#.
 
             - script: |
                 echo ##vso[task.setvariable variable=StartedTests]true

.ado/jobs/integration-test.yml

@@ -94,9 +94,15 @@ jobs:
             - ${{ if eq(matrix.BuildConfiguration, 'Debug') }}:
               # The build is more likely to crash after we've started other bits that
               # take up memory. Do the expensive parts of the build first.
-              - script: yarn windows --no-launch --no-packager --no-deploy --no-autolink --arch ${{ matrix.BuildPlatform }} --logging --buildLogDirectory $(BuildLogDirectory)
-                displayName: yarn windows --no-launch
-                workingDirectory: packages/integration-test-app
+              - template: ../templates/run-windows-with-certificates.yml
+                parameters:
+                  buildEnvironment: ${{ parameters.BuildEnvironment }}
+                  buildConfiguration: ${{ matrix.BuildConfiguration }}
+                  buildPlatform: ${{ matrix.BuildPlatform }}
+                  buildLogDirectory: $(BuildLogDirectory)
+                  workingDirectory: packages/integration-test-app
+                  moreMSBuildProps: --no-packager --no-deploy --no-autolink
+                  errorOnNuGetLockChanges: false # Sometimes the content hashes of NuGet packages are wrong on VMs, workaround for later .NET versions don't work for UWP C#.
 
               - powershell: Start-Process npm.cmd -ArgumentList "run","start"
                 displayName: Start packager
@@ -132,8 +138,18 @@ jobs:
                 workingDirectory: packages/integration-test-app
 
             - ${{ if eq(matrix.BuildConfiguration, 'Release') }}:
-              - script: yarn windows --release ${{ matrix.DeployOptions }} --no-packager --no-autolink --arch ${{ matrix.BuildPlatform }} --logging --buildLogDirectory $(BuildLogDirectory)
-                displayName: yarn windows --release
+              - template: ../templates/run-windows-with-certificates.yml
+                parameters:
+                  buildEnvironment: ${{ parameters.BuildEnvironment }}
+                  buildConfiguration: ${{ matrix.BuildConfiguration }}
+                  buildPlatform: ${{ matrix.BuildPlatform }}
+                  buildLogDirectory: $(BuildLogDirectory)
+                  workingDirectory: packages/integration-test-app
+                  moreMSBuildProps: ${{ matrix.DeployOptions }} --no-packager --no-autolink
+                  errorOnNuGetLockChanges: false # Sometimes the content hashes of NuGet packages are wrong on VMs, workaround for later .NET versions don't work for UWP C#.
+
+              - script: yarn windows --release --no-build ${{ matrix.DeployOptions }} --no-packager --no-autolink --arch ${{ matrix.BuildPlatform }} --logging
+                displayName: yarn windows --release --no-build
                 workingDirectory: packages/integration-test-app
 
             - ${{ if ne(matrix.DeployOptions, '--no-deploy') }}:

.ado/jobs/playground.yml

@@ -130,16 +130,6 @@ jobs:
                 parameters:
                   workingDir: packages\playground\windows
 
-            # NuGet ignores packages.config if it detects <PackageReference>.
-            # Use restore packages.config directly to keep compabitility with ReactNativePicker.
-            - pwsh: |
-                Get-ChildItem -Recurse -Path packages.config |`
-                  Foreach-Object {`
-                    NuGet.exe Restore -PackagesDirectory packages $_`
-                  }
-              workingDirectory: packages/playground/windows
-              displayName: Restore packages.config items
-
             - template: ../templates/msbuild-sln.yml
               parameters:
                 solutionDir: packages/playground/windows

.ado/jobs/sample-apps.yml

@@ -83,6 +83,7 @@ jobs:
                 deployOption:  ${{ matrix.DeployOption }}
                 buildLogDirectory: ${{ variables['BuildLogDirectory'] }}
                 workingDirectory: packages/sample-apps
+                errorOnNuGetLockChanges: false # Sometimes the content hashes of NuGet packages are wrong on VMs, workaround for later .NET versions don't work for UWP C#.
 
             - script: yarn bundle-cpp --verbose
               displayName: Create SampleApp bundle

.ado/templates/detect-nuget-lockfile-changes.yml

@@ -0,0 +1,22 @@
+parameters:
+  - name: errorOnNuGetLockChanges
+    type: boolean
+    default: true
+
+steps:
+  - powershell: |
+        & git add */packages*.lock.json
+        $changed = git status --porcelain=v1 */packages*.lock.json
+        if ($changed -ne $null) {
+          Write-Host "Detected NuGet lock file changes during the build:"
+          Write-Host Files changed:`n([string]::Join("`n", $changed))
+          $diff = git diff --cached -- */packages*.lock.json
+          Write-Host Diff:`n([string]::Join("`n", $diff))
+          $msg = "Detected NuGet lock file changes during the build. Run vnext/Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1 locally in a VS Dev PowerShell to update lock files, then submit the changes."
+          if ("${{ parameters.errorOnNuGetLockChanges }}" -eq "True") {
+            Write-Host "##vso[task.logissue type=error]Detected NuGet lock file changes during the build. Run vnext/Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1 locally in a VS Dev PowerShell to update lock files, then submit the changes."
+            [Environment]::Exit(-1)
+          }
+        }
+    displayName: Detect NuGet lock file changes during build
+    condition: succeededOrFailed()

.ado/templates/msbuild-sln.yml

@@ -55,18 +55,7 @@ steps:
         $(MsBuildWarnAsErrorArgument)
         ${{parameters.msbuildArguments}}
 
-  - powershell: |
-      & git add */packages*.lock.json
-      $changed = git status --porcelain=v1 */packages*.lock.json
-      if ($changed -ne $null) {
-        Write-Host "##[warning] Detected packages.lock.json changes. See full log for details."
-        Write-Host Files changed:`n([string]::Join("`n", $changed))
-        $diff = git diff --cached -- */packages*.lock.json
-        Write-Host Diff:`n([string]::Join("`n", $diff))
-        Write-Host "Run vnext/Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1 to update lock files locally."
-      }
-    displayName: Detect packages.lock.json changes during build
-    condition: succeededOrFailed()
+  - template: detect-nuget-lockfile-changes.yml
 
   - template: upload-build-logs.yml
     parameters:

.ado/templates/run-windows-with-certificates.yml

@@ -26,6 +26,9 @@ parameters:
   - name: restoreForceEvaluate
     type: boolean
     default: true
+  - name: errorOnNuGetLockChanges
+    type: boolean
+    default : true
   - name: moreMSBuildProps
     type: string
     default: ''
@@ -77,3 +80,8 @@ steps:
       workingDirectory: ${{ parameters.workingDirectory }}
 
     - template: ../templates/cleanup-certificate.yml
+
+  - ${{ if eq(parameters.restoreLockedMode, 'true') }}:
+    - template: detect-nuget-lockfile-changes.yml
+      parameters:
+        errorOnNuGetLockChanges: ${{ parameters.errorOnNuGetLockChanges }}

Directory.Build.props

@@ -28,6 +28,7 @@
   <PropertyGroup Label="NuGet">
     <MSBuildProjectExtensionsPath Condition="'$(ProjectName)' != ''">$(RootIntDir)\ProjectExtensions\$(ProjectName)\</MSBuildProjectExtensionsPath>
     <MSBuildProjectExtensionsPath Condition="'$(ProjectName)' == ''">$(RootIntDir)\ProjectExtensions\$(MSBuildProjectName)\</MSBuildProjectExtensionsPath>
+    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
 
   <!-- User overrides -->

packages/@react-native-windows/automation-channel/CHANGELOG.json

@@ -1,6 +1,27 @@
 {
   "name": "@react-native-windows/automation-channel",
   "entries": [
+    {
+      "date": "Wed, 30 Apr 2025 05:27:56 GMT",
+      "version": "0.12.289",
+      "tag": "@react-native-windows/automation-channel_v0.12.289",
+      "comments": {
+        "patch": [
+          {
+            "author": "jthysell@microsoft.com",
+            "package": "@react-native-windows/automation-channel",
+            "commit": "99b2a74ecb0b06435eaa1efc8c1f34025943d3a7",
+            "comment": "Fix NuGet lock files and enforce them not changing accidentally"
+          },
+          {
+            "author": "beachball",
+            "package": "@react-native-windows/automation-channel",
+            "comment": "Bump react-native-windows to v0.0.0-canary.949",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 28 Apr 2025 05:24:25 GMT",
       "version": "0.12.288",

packages/@react-native-windows/automation-channel/CHANGELOG.md

@@ -1,9 +1,18 @@
 # Change Log - @react-native-windows/automation-channel
 
-<!-- This log was last generated on Mon, 28 Apr 2025 05:24:25 GMT and should not be manually modified. -->
+<!-- This log was last generated on Wed, 30 Apr 2025 05:27:56 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 0.12.289
+
+Wed, 30 Apr 2025 05:27:56 GMT
+
+### Patches
+
+- Fix NuGet lock files and enforce them not changing accidentally (jthysell@microsoft.com)
+- Bump react-native-windows to v0.0.0-canary.949
+
 ## 0.12.288
 
 Mon, 28 Apr 2025 05:24:25 GMT