From d8cb6eaf2c32698321f9452078ecee1e44be7ee8 Mon Sep 17 00:00:00 2001 From: Andrew Coates <30809111+acoates-ms@users.noreply.github.com> Date: Thu, 23 Jan 2025 10:22:10 -0800 Subject: [PATCH 1/8] Fix crash running on server 2016 --- ...-db1edeae-cd39-4b02-9676-e41d36724426.json | 7 +++++++ .../ReactHost/ReactInstanceWin.cpp | 20 ++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 change/react-native-windows-db1edeae-cd39-4b02-9676-e41d36724426.json diff --git a/change/react-native-windows-db1edeae-cd39-4b02-9676-e41d36724426.json b/change/react-native-windows-db1edeae-cd39-4b02-9676-e41d36724426.json new file mode 100644 index 00000000000..0fd07515148 --- /dev/null +++ b/change/react-native-windows-db1edeae-cd39-4b02-9676-e41d36724426.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Fix crash running on server 2016", + "packageName": "react-native-windows", + "email": "30809111+acoates-ms@users.noreply.github.com", + "dependentChangeType": "patch" +} diff --git a/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp b/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp index 528c880f052..ead0aed2ad8 100644 --- a/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp +++ b/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp @@ -588,6 +588,24 @@ std::unique_ptr CreatePreparedScriptStore() } #ifdef USE_FABRIC + +typedef HRESULT(__stdcall *SetThreadDescriptionFn)(HANDLE, PCWSTR); +void SetJSThreadDescription() noexcept { + // Office still supports Server 2016 so we need to use Run Time Dynamic Linking and cannot just use: + // ::SetThreadDescription(GetCurrentThread(), L"React-Native JavaScript Thread"); + + auto moduleHandle = GetModuleHandleW(L"kernelbase.dll"); + // The description is just for developer experience, so we can skip it if kernelbase isn't already loaded + if (!moduleHandle) + return; + + auto proc = GetProcAddress(moduleHandle, "SetThreadDescription"); + if (!proc) + return; + + reinterpret_cast(proc)(GetCurrentThread(), L"React-Native JavaScript Thread"); +} + void ReactInstanceWin::InitializeBridgeless() noexcept { InitUIQueue(); @@ -636,7 +654,7 @@ void ReactInstanceWin::InitializeBridgeless() noexcept { Mso::Copy(m_whenDestroyed))); m_jsMessageThread.Load()->runOnQueueSync([&]() { - ::SetThreadDescription(GetCurrentThread(), L"React-Native JavaScript Thread"); + SetJSThreadDescription(); auto timerRegistry = ::Microsoft::ReactNative::TimerRegistry::CreateTimerRegistry(m_reactContext->Properties()); auto timerRegistryRaw = timerRegistry.get(); From 7d61bd9144a8492b75449f5dc3c22c1af21c6327 Mon Sep 17 00:00:00 2001 From: Andrew Coates <30809111+acoates-ms@users.noreply.github.com> Date: Thu, 23 Jan 2025 10:22:30 -0800 Subject: [PATCH 2/8] RNIsland UIA fragment root should report parents fragment root --- vnext/ExperimentalFeatures.props | 1 + .../CompositionRootAutomationProvider.cpp | 40 +++++++++++++++++-- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/vnext/ExperimentalFeatures.props b/vnext/ExperimentalFeatures.props index 02dae28584a..6e0856fae68 100644 --- a/vnext/ExperimentalFeatures.props +++ b/vnext/ExperimentalFeatures.props @@ -1,6 +1,7 @@ false + true true diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp index a1ab4e62227..6a2f7428e23 100644 --- a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp +++ b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp @@ -27,6 +27,21 @@ HRESULT __stdcall CompositionRootAutomationProvider::GetRuntimeId(SAFEARRAY **pR *pRetVal = nullptr; + if (!m_island) + return E_FAIL; + + auto id = reinterpret_cast(winrt::get_unknown(m_island)); + + *pRetVal = SafeArrayCreateVector(VT_I4, 0, 3); + if (*pRetVal == nullptr) + return E_OUTOFMEMORY; + + auto rgiRuntimeId = static_cast((*pRetVal)->pvData); + + rgiRuntimeId[0] = UiaAppendRuntimeId; + rgiRuntimeId[1] = LODWORD(id); + rgiRuntimeId[2] = HIDWORD(id); + return S_OK; } @@ -153,8 +168,18 @@ HRESULT __stdcall CompositionRootAutomationProvider::get_FragmentRoot(IRawElemen if (pRetVal == nullptr) return E_POINTER; - AddRef(); - *pRetVal = this; + *pRetVal = nullptr; + + if (m_island) + { + auto parentRoot = m_island.FragmentRootAutomationProvider(); + auto spFragment = parentRoot.try_as(); + if (spFragment) + { + *pRetVal = spFragment.detach(); + return S_OK; + } + } return S_OK; } @@ -249,8 +274,6 @@ HRESULT __stdcall CompositionRootAutomationProvider::Navigate( if (pRetVal == nullptr) return E_POINTER; - // Fragment roots do not enable navigation to a parent or siblings; navigation among fragment roots is handled by the - // default window providers. Elements in fragments must navigate only to other elements within that fragment. if (direction == NavigateDirection_FirstChild || direction == NavigateDirection_LastChild) { if (auto rootView = rootComponentView()) { auto uiaProvider = rootView->EnsureUiaProvider(); @@ -260,6 +283,15 @@ HRESULT __stdcall CompositionRootAutomationProvider::Navigate( return S_OK; } } + } else if (direction == NavigateDirection_Parent) { + if (m_island) { + auto parent = m_island.ParentAutomationProvider(); + auto spFragment = parent.try_as(); + if (spFragment) { + *pRetVal = spFragment.detach(); + return S_OK; + } + } } *pRetVal = nullptr; return S_OK; From a1c58a1484594928698026777498b80e353fee97 Mon Sep 17 00:00:00 2001 From: Andrew Coates <30809111+acoates-ms@users.noreply.github.com> Date: Thu, 23 Jan 2025 10:23:05 -0800 Subject: [PATCH 3/8] Change files --- ...ative-windows-85407e5a-8b6f-41fe-b146-e73c385e9b34.json | 7 +++++++ ...ative-windows-db1edeae-cd39-4b02-9676-e41d36724426.json | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 change/react-native-windows-85407e5a-8b6f-41fe-b146-e73c385e9b34.json diff --git a/change/react-native-windows-85407e5a-8b6f-41fe-b146-e73c385e9b34.json b/change/react-native-windows-85407e5a-8b6f-41fe-b146-e73c385e9b34.json new file mode 100644 index 00000000000..8416a933042 --- /dev/null +++ b/change/react-native-windows-85407e5a-8b6f-41fe-b146-e73c385e9b34.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "RNIsland UIA fragment root should report parents fragment root", + "packageName": "react-native-windows", + "email": "30809111+acoates-ms@users.noreply.github.com", + "dependentChangeType": "patch" +} diff --git a/change/react-native-windows-db1edeae-cd39-4b02-9676-e41d36724426.json b/change/react-native-windows-db1edeae-cd39-4b02-9676-e41d36724426.json index 0fd07515148..4f047d4bba5 100644 --- a/change/react-native-windows-db1edeae-cd39-4b02-9676-e41d36724426.json +++ b/change/react-native-windows-db1edeae-cd39-4b02-9676-e41d36724426.json @@ -1,7 +1,7 @@ { - "type": "patch", + "type": "prerelease", "comment": "Fix crash running on server 2016", "packageName": "react-native-windows", "email": "30809111+acoates-ms@users.noreply.github.com", "dependentChangeType": "patch" -} +} \ No newline at end of file From c2bebe12a4e1a03779943c3325a25b3f6bb6fea1 Mon Sep 17 00:00:00 2001 From: Andrew Coates <30809111+acoates-ms@users.noreply.github.com> Date: Thu, 23 Jan 2025 11:27:16 -0800 Subject: [PATCH 4/8] fix --- .../CompositionRootAutomationProvider.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp index 6a2f7428e23..f84fcb79185 100644 --- a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp +++ b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp @@ -36,7 +36,7 @@ HRESULT __stdcall CompositionRootAutomationProvider::GetRuntimeId(SAFEARRAY **pR if (*pRetVal == nullptr) return E_OUTOFMEMORY; - auto rgiRuntimeId = static_cast((*pRetVal)->pvData); + auto rgiRuntimeId = static_cast((*pRetVal)->pvData); rgiRuntimeId[0] = UiaAppendRuntimeId; rgiRuntimeId[1] = LODWORD(id); @@ -170,16 +170,16 @@ HRESULT __stdcall CompositionRootAutomationProvider::get_FragmentRoot(IRawElemen *pRetVal = nullptr; - if (m_island) - { +#ifdef USE_EXPERIMENTAL_WINUI3 + if (m_island) { auto parentRoot = m_island.FragmentRootAutomationProvider(); auto spFragment = parentRoot.try_as(); - if (spFragment) - { + if (spFragment) { *pRetVal = spFragment.detach(); return S_OK; } } +#endif return S_OK; } @@ -284,6 +284,7 @@ HRESULT __stdcall CompositionRootAutomationProvider::Navigate( } } } else if (direction == NavigateDirection_Parent) { +#ifdef USE_EXPERIMENTAL_WINUI3 if (m_island) { auto parent = m_island.ParentAutomationProvider(); auto spFragment = parent.try_as(); @@ -292,6 +293,7 @@ HRESULT __stdcall CompositionRootAutomationProvider::Navigate( return S_OK; } } +#endif } *pRetVal = nullptr; return S_OK; From 27a0e96151809e2423995fd33e112a2de94970f4 Mon Sep 17 00:00:00 2001 From: Andrew Coates <30809111+acoates-ms@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:35:30 -0800 Subject: [PATCH 5/8] use react tag for runtime id --- vnext/Desktop.ABITests/packages.lock.json | 32 +++++++-------- vnext/Desktop.DLL/packages.lock.json | 8 ++-- .../packages.lock.json | 12 +++--- vnext/Desktop.UnitTests/packages.lock.json | 12 +++--- vnext/Desktop/packages.lock.json | 40 +++++++++---------- .../CompositionRootAutomationProvider.cpp | 10 ++++- .../ReactCommon.UnitTests/packages.lock.json | 36 ++++++++--------- 7 files changed, 78 insertions(+), 72 deletions(-) diff --git a/vnext/Desktop.ABITests/packages.lock.json b/vnext/Desktop.ABITests/packages.lock.json index 6041b76741f..a74dbe8fc3d 100644 --- a/vnext/Desktop.ABITests/packages.lock.json +++ b/vnext/Desktop.ABITests/packages.lock.json @@ -56,10 +56,10 @@ }, "Microsoft.WindowsAppSDK": { "type": "Transitive", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } }, @@ -99,7 +99,7 @@ "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", "Microsoft.Web.WebView2": "[1.0.2651.64, )", - "Microsoft.WindowsAppSDK": "[1.6.240923002, )", + "Microsoft.WindowsAppSDK": "[1.7.250109001-experimental2, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", "boost": "[1.83.0, )" @@ -132,10 +132,10 @@ }, "Microsoft.WindowsAppSDK": { "type": "Transitive", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } } @@ -149,10 +149,10 @@ }, "Microsoft.WindowsAppSDK": { "type": "Transitive", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } } @@ -166,10 +166,10 @@ }, "Microsoft.WindowsAppSDK": { "type": "Transitive", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } } @@ -183,10 +183,10 @@ }, "Microsoft.WindowsAppSDK": { "type": "Transitive", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } } diff --git a/vnext/Desktop.DLL/packages.lock.json b/vnext/Desktop.DLL/packages.lock.json index e98298f0655..dd4df283b34 100644 --- a/vnext/Desktop.DLL/packages.lock.json +++ b/vnext/Desktop.DLL/packages.lock.json @@ -52,10 +52,10 @@ }, "Microsoft.WindowsAppSDK": { "type": "Transitive", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } }, @@ -90,7 +90,7 @@ "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", "Microsoft.Web.WebView2": "[1.0.2651.64, )", - "Microsoft.WindowsAppSDK": "[1.6.240923002, )", + "Microsoft.WindowsAppSDK": "[1.7.250109001-experimental2, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", "boost": "[1.83.0, )" diff --git a/vnext/Desktop.IntegrationTests/packages.lock.json b/vnext/Desktop.IntegrationTests/packages.lock.json index ece83bccfe5..9482759621d 100644 --- a/vnext/Desktop.IntegrationTests/packages.lock.json +++ b/vnext/Desktop.IntegrationTests/packages.lock.json @@ -63,10 +63,10 @@ }, "Microsoft.WindowsAppSDK": { "type": "Transitive", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } }, @@ -82,8 +82,8 @@ "folly": { "type": "Project", "dependencies": { - "Fmt": "[1.0.0, )", - "boost": "[1.83.0, )" + "boost": "[1.83.0, )", + "fmt": "[1.0.0, )" } }, "follywin32": { @@ -101,7 +101,7 @@ "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", "Microsoft.Web.WebView2": "[1.0.2651.64, )", - "Microsoft.WindowsAppSDK": "[1.6.240923002, )", + "Microsoft.WindowsAppSDK": "[1.7.250109001-experimental2, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", "boost": "[1.83.0, )" diff --git a/vnext/Desktop.UnitTests/packages.lock.json b/vnext/Desktop.UnitTests/packages.lock.json index b023eff5948..8fc0ddd6907 100644 --- a/vnext/Desktop.UnitTests/packages.lock.json +++ b/vnext/Desktop.UnitTests/packages.lock.json @@ -56,10 +56,10 @@ }, "Microsoft.WindowsAppSDK": { "type": "Transitive", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } }, @@ -80,8 +80,8 @@ "folly": { "type": "Project", "dependencies": { - "boost": "[1.83.0, )", - "fmt": "[1.0.0, )" + "Fmt": "[1.0.0, )", + "boost": "[1.83.0, )" } }, "follywin32": { @@ -99,7 +99,7 @@ "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", "Microsoft.Web.WebView2": "[1.0.2651.64, )", - "Microsoft.WindowsAppSDK": "[1.6.240923002, )", + "Microsoft.WindowsAppSDK": "[1.7.250109001-experimental2, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", "boost": "[1.83.0, )" diff --git a/vnext/Desktop/packages.lock.json b/vnext/Desktop/packages.lock.json index bbff4ba4c07..e45e4ea71aa 100644 --- a/vnext/Desktop/packages.lock.json +++ b/vnext/Desktop/packages.lock.json @@ -38,11 +38,11 @@ }, "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.6.240923002, )", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "requested": "[1.7.250109001-experimental2, )", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } }, @@ -106,11 +106,11 @@ }, "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.6.240923002, )", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "requested": "[1.7.250109001-experimental2, )", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } } @@ -124,11 +124,11 @@ }, "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.6.240923002, )", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "requested": "[1.7.250109001-experimental2, )", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } } @@ -142,11 +142,11 @@ }, "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.6.240923002, )", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "requested": "[1.7.250109001-experimental2, )", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } } @@ -160,11 +160,11 @@ }, "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.6.240923002, )", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "requested": "[1.7.250109001-experimental2, )", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } } diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp index f84fcb79185..6186a69cca5 100644 --- a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp +++ b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp @@ -39,8 +39,14 @@ HRESULT __stdcall CompositionRootAutomationProvider::GetRuntimeId(SAFEARRAY **pR auto rgiRuntimeId = static_cast((*pRetVal)->pvData); rgiRuntimeId[0] = UiaAppendRuntimeId; - rgiRuntimeId[1] = LODWORD(id); - rgiRuntimeId[2] = HIDWORD(id); + rgiRuntimeId[1] = 0; + rgiRuntimeId[2] = 0; + + if (auto rootView = m_wkRootView.get()) { + auto tag = rootView->RootTag(); + rgiRuntimeId[1] = LODWORD(tag); + rgiRuntimeId[2] = HIDWORD(tag); + } return S_OK; } diff --git a/vnext/ReactCommon.UnitTests/packages.lock.json b/vnext/ReactCommon.UnitTests/packages.lock.json index d98bf049883..789312b1808 100644 --- a/vnext/ReactCommon.UnitTests/packages.lock.json +++ b/vnext/ReactCommon.UnitTests/packages.lock.json @@ -56,10 +56,10 @@ }, "Microsoft.WindowsAppSDK": { "type": "Transitive", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } }, @@ -75,8 +75,8 @@ "folly": { "type": "Project", "dependencies": { - "boost": "[1.83.0, )", - "fmt": "[1.0.0, )" + "Fmt": "[1.0.0, )", + "boost": "[1.83.0, )" } }, "follywin32": { @@ -94,7 +94,7 @@ "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", "Microsoft.Web.WebView2": "[1.0.2651.64, )", - "Microsoft.WindowsAppSDK": "[1.6.240923002, )", + "Microsoft.WindowsAppSDK": "[1.7.250109001-experimental2, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", "boost": "[1.83.0, )" @@ -116,10 +116,10 @@ }, "Microsoft.WindowsAppSDK": { "type": "Transitive", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } } @@ -132,10 +132,10 @@ }, "Microsoft.WindowsAppSDK": { "type": "Transitive", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } } @@ -148,10 +148,10 @@ }, "Microsoft.WindowsAppSDK": { "type": "Transitive", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } } @@ -164,10 +164,10 @@ }, "Microsoft.WindowsAppSDK": { "type": "Transitive", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "resolved": "1.7.250109001-experimental2", + "contentHash": "leUsCOh27uNnygO/AtohKnnvyZ+j0vaOh4oWlmiv3zs4HuCe46O04+25GennjmmwgESvahWp+RLTGMTJgdQd0Q==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } } From 4c2fb56e1b127f922980d79fc2d46f8487b725f7 Mon Sep 17 00:00:00 2001 From: Andrew Coates <30809111+acoates-ms@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:27:58 -0800 Subject: [PATCH 6/8] fix --- vnext/Desktop.DLL/packages.lock.json | 2 +- .../Fabric/Composition/CompositionRootAutomationProvider.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vnext/Desktop.DLL/packages.lock.json b/vnext/Desktop.DLL/packages.lock.json index dd4df283b34..7728dc56184 100644 --- a/vnext/Desktop.DLL/packages.lock.json +++ b/vnext/Desktop.DLL/packages.lock.json @@ -42,7 +42,7 @@ }, "Microsoft.Web.WebView2": { "type": "Transitive", - "resolved": "1.0.2651.64", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.Windows.SDK.BuildTools": { diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp index 6186a69cca5..7b0fec8d9e1 100644 --- a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp +++ b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp @@ -43,7 +43,7 @@ HRESULT __stdcall CompositionRootAutomationProvider::GetRuntimeId(SAFEARRAY **pR rgiRuntimeId[2] = 0; if (auto rootView = m_wkRootView.get()) { - auto tag = rootView->RootTag(); + auto tag = rootView.RootTag(); rgiRuntimeId[1] = LODWORD(tag); rgiRuntimeId[2] = HIDWORD(tag); } From fe064305955413d64011bb6719aab1844b8042f4 Mon Sep 17 00:00:00 2001 From: Andrew Coates <30809111+acoates-ms@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:59:48 -0800 Subject: [PATCH 7/8] fix --- vnext/Desktop.ABITests/packages.lock.json | 22 +++++++++---------- vnext/Desktop.DLL/packages.lock.json | 2 +- .../packages.lock.json | 6 ++--- vnext/Desktop.UnitTests/packages.lock.json | 4 ++-- vnext/Desktop/packages.lock.json | 20 ++++++++--------- vnext/Mso.UnitTests/packages.fabric.lock.json | 20 ++++++++--------- vnext/PropertySheets/WebView2.props | 2 +- .../ReactCommon.UnitTests/packages.lock.json | 12 +++++----- 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/vnext/Desktop.ABITests/packages.lock.json b/vnext/Desktop.ABITests/packages.lock.json index a74dbe8fc3d..fc0154d560a 100644 --- a/vnext/Desktop.ABITests/packages.lock.json +++ b/vnext/Desktop.ABITests/packages.lock.json @@ -10,8 +10,8 @@ }, "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2651.64, )", - "resolved": "1.0.2651.64", + "requested": "[1.0.2792.45, )", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.Windows.CppWinRT": { @@ -98,7 +98,7 @@ "FollyWin32": "[1.0.0, )", "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", - "Microsoft.Web.WebView2": "[1.0.2651.64, )", + "Microsoft.Web.WebView2": "[1.0.2792.45, )", "Microsoft.WindowsAppSDK": "[1.7.250109001-experimental2, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", @@ -126,8 +126,8 @@ "native,Version=v0.0/win": { "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2651.64, )", - "resolved": "1.0.2651.64", + "requested": "[1.0.2792.45, )", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.WindowsAppSDK": { @@ -143,8 +143,8 @@ "native,Version=v0.0/win-arm64": { "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2651.64, )", - "resolved": "1.0.2651.64", + "requested": "[1.0.2792.45, )", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.WindowsAppSDK": { @@ -160,8 +160,8 @@ "native,Version=v0.0/win-x64": { "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2651.64, )", - "resolved": "1.0.2651.64", + "requested": "[1.0.2792.45, )", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.WindowsAppSDK": { @@ -177,8 +177,8 @@ "native,Version=v0.0/win-x86": { "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2651.64, )", - "resolved": "1.0.2651.64", + "requested": "[1.0.2792.45, )", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.WindowsAppSDK": { diff --git a/vnext/Desktop.DLL/packages.lock.json b/vnext/Desktop.DLL/packages.lock.json index 7728dc56184..4d2461f3012 100644 --- a/vnext/Desktop.DLL/packages.lock.json +++ b/vnext/Desktop.DLL/packages.lock.json @@ -89,7 +89,7 @@ "FollyWin32": "[1.0.0, )", "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", - "Microsoft.Web.WebView2": "[1.0.2651.64, )", + "Microsoft.Web.WebView2": "[1.0.2792.45, )", "Microsoft.WindowsAppSDK": "[1.7.250109001-experimental2, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", diff --git a/vnext/Desktop.IntegrationTests/packages.lock.json b/vnext/Desktop.IntegrationTests/packages.lock.json index 9482759621d..8f49934ebdb 100644 --- a/vnext/Desktop.IntegrationTests/packages.lock.json +++ b/vnext/Desktop.IntegrationTests/packages.lock.json @@ -10,8 +10,8 @@ }, "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2651.64, )", - "resolved": "1.0.2651.64", + "requested": "[1.0.2792.45, )", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.Windows.CppWinRT": { @@ -100,7 +100,7 @@ "FollyWin32": "[1.0.0, )", "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", - "Microsoft.Web.WebView2": "[1.0.2651.64, )", + "Microsoft.Web.WebView2": "[1.0.2792.45, )", "Microsoft.WindowsAppSDK": "[1.7.250109001-experimental2, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", diff --git a/vnext/Desktop.UnitTests/packages.lock.json b/vnext/Desktop.UnitTests/packages.lock.json index 8fc0ddd6907..ef770cfb039 100644 --- a/vnext/Desktop.UnitTests/packages.lock.json +++ b/vnext/Desktop.UnitTests/packages.lock.json @@ -46,7 +46,7 @@ }, "Microsoft.Web.WebView2": { "type": "Transitive", - "resolved": "1.0.2651.64", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.Windows.SDK.BuildTools": { @@ -98,7 +98,7 @@ "FollyWin32": "[1.0.0, )", "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", - "Microsoft.Web.WebView2": "[1.0.2651.64, )", + "Microsoft.Web.WebView2": "[1.0.2792.45, )", "Microsoft.WindowsAppSDK": "[1.7.250109001-experimental2, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", diff --git a/vnext/Desktop/packages.lock.json b/vnext/Desktop/packages.lock.json index e45e4ea71aa..e470705698b 100644 --- a/vnext/Desktop/packages.lock.json +++ b/vnext/Desktop/packages.lock.json @@ -26,8 +26,8 @@ }, "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2651.64, )", - "resolved": "1.0.2651.64", + "requested": "[1.0.2792.45, )", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.Windows.CppWinRT": { @@ -100,8 +100,8 @@ "native,Version=v0.0/win": { "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2651.64, )", - "resolved": "1.0.2651.64", + "requested": "[1.0.2792.45, )", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.WindowsAppSDK": { @@ -118,8 +118,8 @@ "native,Version=v0.0/win-arm64": { "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2651.64, )", - "resolved": "1.0.2651.64", + "requested": "[1.0.2792.45, )", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.WindowsAppSDK": { @@ -136,8 +136,8 @@ "native,Version=v0.0/win-x64": { "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2651.64, )", - "resolved": "1.0.2651.64", + "requested": "[1.0.2792.45, )", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.WindowsAppSDK": { @@ -154,8 +154,8 @@ "native,Version=v0.0/win-x86": { "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2651.64, )", - "resolved": "1.0.2651.64", + "requested": "[1.0.2792.45, )", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.WindowsAppSDK": { diff --git a/vnext/Mso.UnitTests/packages.fabric.lock.json b/vnext/Mso.UnitTests/packages.fabric.lock.json index a9a25492661..cd90ec731f2 100644 --- a/vnext/Mso.UnitTests/packages.fabric.lock.json +++ b/vnext/Mso.UnitTests/packages.fabric.lock.json @@ -20,13 +20,13 @@ "resolved": "1.6.240923002", "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } }, "Microsoft.Web.WebView2": { "type": "Transitive", - "resolved": "1.0.2651.64", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.Windows.SDK.BuildTools": { @@ -42,13 +42,13 @@ "resolved": "1.6.240923002", "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } }, "Microsoft.Web.WebView2": { "type": "Transitive", - "resolved": "1.0.2651.64", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" } }, @@ -59,13 +59,13 @@ "resolved": "1.6.240923002", "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } }, "Microsoft.Web.WebView2": { "type": "Transitive", - "resolved": "1.0.2651.64", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" } }, @@ -76,13 +76,13 @@ "resolved": "1.6.240923002", "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } }, "Microsoft.Web.WebView2": { "type": "Transitive", - "resolved": "1.0.2651.64", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" } }, @@ -93,13 +93,13 @@ "resolved": "1.6.240923002", "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", "dependencies": { - "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Web.WebView2": "1.0.2792.45", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } }, "Microsoft.Web.WebView2": { "type": "Transitive", - "resolved": "1.0.2651.64", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" } } diff --git a/vnext/PropertySheets/WebView2.props b/vnext/PropertySheets/WebView2.props index 833e9a74657..87113a25e7c 100644 --- a/vnext/PropertySheets/WebView2.props +++ b/vnext/PropertySheets/WebView2.props @@ -2,6 +2,6 @@ - 1.0.2651.64 + 1.0.2792.45 diff --git a/vnext/ReactCommon.UnitTests/packages.lock.json b/vnext/ReactCommon.UnitTests/packages.lock.json index 789312b1808..5be78c8a8e4 100644 --- a/vnext/ReactCommon.UnitTests/packages.lock.json +++ b/vnext/ReactCommon.UnitTests/packages.lock.json @@ -46,7 +46,7 @@ }, "Microsoft.Web.WebView2": { "type": "Transitive", - "resolved": "1.0.2651.64", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.Windows.SDK.BuildTools": { @@ -93,7 +93,7 @@ "FollyWin32": "[1.0.0, )", "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", - "Microsoft.Web.WebView2": "[1.0.2651.64, )", + "Microsoft.Web.WebView2": "[1.0.2792.45, )", "Microsoft.WindowsAppSDK": "[1.7.250109001-experimental2, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", @@ -111,7 +111,7 @@ "native,Version=v0.0/win": { "Microsoft.Web.WebView2": { "type": "Transitive", - "resolved": "1.0.2651.64", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.WindowsAppSDK": { @@ -127,7 +127,7 @@ "native,Version=v0.0/win-arm64": { "Microsoft.Web.WebView2": { "type": "Transitive", - "resolved": "1.0.2651.64", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.WindowsAppSDK": { @@ -143,7 +143,7 @@ "native,Version=v0.0/win-x64": { "Microsoft.Web.WebView2": { "type": "Transitive", - "resolved": "1.0.2651.64", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.WindowsAppSDK": { @@ -159,7 +159,7 @@ "native,Version=v0.0/win-x86": { "Microsoft.Web.WebView2": { "type": "Transitive", - "resolved": "1.0.2651.64", + "resolved": "1.0.2792.45", "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" }, "Microsoft.WindowsAppSDK": { From acdc61fc3a9d22ec7ea022650587beececb40f2c Mon Sep 17 00:00:00 2001 From: Andrew Coates <30809111+acoates-ms@users.noreply.github.com> Date: Thu, 23 Jan 2025 16:17:24 -0800 Subject: [PATCH 8/8] fix --- vnext/ExperimentalFeatures.props | 1 + .../Fabric/Composition/CompositionRootAutomationProvider.cpp | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/vnext/ExperimentalFeatures.props b/vnext/ExperimentalFeatures.props index 6e0856fae68..c853b5b4a69 100644 --- a/vnext/ExperimentalFeatures.props +++ b/vnext/ExperimentalFeatures.props @@ -2,6 +2,7 @@ false true + false true diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp index 7b0fec8d9e1..b5c27775ce3 100644 --- a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp +++ b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp @@ -30,8 +30,6 @@ HRESULT __stdcall CompositionRootAutomationProvider::GetRuntimeId(SAFEARRAY **pR if (!m_island) return E_FAIL; - auto id = reinterpret_cast(winrt::get_unknown(m_island)); - *pRetVal = SafeArrayCreateVector(VT_I4, 0, 3); if (*pRetVal == nullptr) return E_OUTOFMEMORY;