From c7ac95dc86466e1939b0792e6dc8f9c0a13eb93e Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Date: Tue, 9 Jun 2026 11:37:41 +0200
Subject: [PATCH] fix(windows): workaround for MSB4006 circular dependency in
CppWinRT
---
.github/labeler.yml | 2 ++
.yarn/plugins/undo-bin-sorting.cjs | 8 ++++----
packages/app/windows/Win32/ReactApp.Package.wapproj | 2 +-
packages/app/windows/Win32/ReactApp.vcxproj | 2 ++
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 437e800e8..1cb2a76be 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -64,6 +64,7 @@
- packages/app/scripts/init.mjs
- packages/app/scripts/template.mjs
- packages/app/scripts/build/xcodebuild.sh
+ - packages/example-macos/**/*
"platform: visionOS":
- changed-files:
- any-glob-to-any-file:
@@ -103,3 +104,4 @@
- packages/app/scripts/init.mjs
- packages/app/scripts/template.mjs
- packages/app/windows/**/*
+ - packages/example-windows/**/*
diff --git a/.yarn/plugins/undo-bin-sorting.cjs b/.yarn/plugins/undo-bin-sorting.cjs
index 2639974bb..df74e4086 100644
--- a/.yarn/plugins/undo-bin-sorting.cjs
+++ b/.yarn/plugins/undo-bin-sorting.cjs
@@ -24,6 +24,7 @@ module.exports = {
// @ts-expect-error Yarn internal package
const { npath } = require("@yarnpkg/fslib");
const fs = require("node:fs");
+ const { EOL } = require("node:os");
const asText = /** @type {const} */ ({ encoding: "utf-8" });
@@ -67,10 +68,9 @@ module.exports = {
for (let i = 0; i < length; ++i) {
if (bin[i] !== orig_bin[i]) {
manifest.bin = orig_manifest.bin;
- const fd = fs.openSync(manifestPath, "w", 0o644);
- fs.writeSync(fd, JSON.stringify(manifest, undefined, 2));
- fs.writeSync(fd, "\n");
- fs.closeSync(fd);
+ const serialized = JSON.stringify(manifest, undefined, 2);
+ const reverted = serialized.replace(/\r?\n/g, EOL) + EOL;
+ fs.writeFileSync(manifestPath, reverted, asText);
break;
}
}
diff --git a/packages/app/windows/Win32/ReactApp.Package.wapproj b/packages/app/windows/Win32/ReactApp.Package.wapproj
index ea9bc070f..2f8bc6255 100644
--- a/packages/app/windows/Win32/ReactApp.Package.wapproj
+++ b/packages/app/windows/Win32/ReactApp.Package.wapproj
@@ -10,7 +10,7 @@
NativeOnly
- $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\
+ $([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\
diff --git a/packages/app/windows/Win32/ReactApp.vcxproj b/packages/app/windows/Win32/ReactApp.vcxproj
index a9c01e304..e0078136f 100644
--- a/packages/app/windows/Win32/ReactApp.vcxproj
+++ b/packages/app/windows/Win32/ReactApp.vcxproj
@@ -3,6 +3,8 @@
true
+
+ true
true
{B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}
ReactApp