Skip to content

Commit

Permalink
RNIsland UIA fragment root should report parents fragment root (#14302)
Browse files Browse the repository at this point in the history
* Fix crash running on server 2016

* RNIsland UIA fragment root should report parents fragment root

* Change files

* fix

* use react tag for runtime id

* fix

* fix

* fix
  • Loading branch information
acoates-ms authored Jan 24, 2025
1 parent 11521a9 commit b438707
Show file tree
Hide file tree
Showing 13 changed files with 192 additions and 120 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "RNIsland UIA fragment root should report parents fragment root",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Fix crash running on server 2016",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
54 changes: 27 additions & 27 deletions vnext/Desktop.ABITests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
}
},
Expand Down Expand Up @@ -98,8 +98,8 @@
"FollyWin32": "[1.0.0, )",
"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.Web.WebView2": "[1.0.2792.45, )",
"Microsoft.WindowsAppSDK": "[1.7.250109001-experimental2, )",
"ReactCommon": "[1.0.0, )",
"ReactNative.V8Jsi.Windows": "[0.71.8, )",
"boost": "[1.83.0, )"
Expand All @@ -126,67 +126,67 @@
"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": {
"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"
}
}
},
"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": {
"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"
}
}
},
"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": {
"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"
}
}
},
"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": {
"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"
}
}
Expand Down
12 changes: 6 additions & 6 deletions vnext/Desktop.DLL/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
},
Expand Down Expand Up @@ -89,8 +89,8 @@
"FollyWin32": "[1.0.0, )",
"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.Web.WebView2": "[1.0.2792.45, )",
"Microsoft.WindowsAppSDK": "[1.7.250109001-experimental2, )",
"ReactCommon": "[1.0.0, )",
"ReactNative.V8Jsi.Windows": "[0.71.8, )",
"boost": "[1.83.0, )"
Expand Down
18 changes: 9 additions & 9 deletions vnext/Desktop.IntegrationTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
}
},
Expand All @@ -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": {
Expand All @@ -100,8 +100,8 @@
"FollyWin32": "[1.0.0, )",
"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.Web.WebView2": "[1.0.2792.45, )",
"Microsoft.WindowsAppSDK": "[1.7.250109001-experimental2, )",
"ReactCommon": "[1.0.0, )",
"ReactNative.V8Jsi.Windows": "[0.71.8, )",
"boost": "[1.83.0, )"
Expand Down
16 changes: 8 additions & 8 deletions vnext/Desktop.UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
},
Expand All @@ -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": {
Expand All @@ -98,8 +98,8 @@
"FollyWin32": "[1.0.0, )",
"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.Web.WebView2": "[1.0.2792.45, )",
"Microsoft.WindowsAppSDK": "[1.7.250109001-experimental2, )",
"ReactCommon": "[1.0.0, )",
"ReactNative.V8Jsi.Windows": "[0.71.8, )",
"boost": "[1.83.0, )"
Expand Down
60 changes: 30 additions & 30 deletions vnext/Desktop/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
},
Expand Down Expand Up @@ -100,71 +100,71 @@
"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": {
"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"
}
}
},
"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": {
"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"
}
}
},
"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": {
"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"
}
}
},
"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": {
"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"
}
}
Expand Down
2 changes: 2 additions & 0 deletions vnext/ExperimentalFeatures.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<Project>
<PropertyGroup Condition="'$(SolutionName)'=='ReactWindows-Desktop'">
<RnwNewArch>false</RnwNewArch>
<UseExperimentalWinUI3>true</UseExperimentalWinUI3>
<WindowsAppSdkAutoInitialize>false</WindowsAppSdkAutoInitialize>
</PropertyGroup>
<PropertyGroup>
<ReactExperimentalFeaturesSet>true</ReactExperimentalFeaturesSet>
Expand Down
Loading

0 comments on commit b438707

Please sign in to comment.