Skip to content

Commit 21a93f9

Browse files
acoates-msacoates-ms
authored
[0.74] Bump to using WASDK 1.7 experimental 3 (#14344)
* Bump to using WASK 1.7 experimental 3 * Change files * build fix * fix
1 parent 6e11881 commit 21a93f9

File tree

6 files changed

+135
-204
lines changed

6 files changed

+135
-204
lines changed

‎change/react-native-windows-51d9d649-258a-4b5f-9052-b30f390b76c0.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Bump to using WASK 1.7 experimental 3",
4+
"packageName": "react-native-windows",
5+
"email": "30809111+acoates-ms@users.noreply.github.com",
6+
"dependentChangeType": "patch"
7+
}

‎packages/playground/windows/playground-composition.Package/packages.lock.json

Lines changed: 11 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -2,66 +2,15 @@
22
"version": 1,
33
"dependencies": {
44
"UAP,Version=v10.0.17763": {
5-
"boost": {
6-
"type": "Transitive",
7-
"resolved": "1.83.0",
8-
"contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ=="
9-
},
10-
"Microsoft.Build.Tasks.Git": {
11-
"type": "Transitive",
12-
"resolved": "1.1.1",
13-
"contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
14-
},
15-
"Microsoft.JavaScript.Hermes": {
16-
"type": "Transitive",
17-
"resolved": "0.1.23",
18-
"contentHash": "cA9t1GjY4Yo0JD1AfA//e1lOwk48hLANfuX6GXrikmEBNZVr2TIX5ONJt5tqCnpZyLz6xGiPDgTfFNKbSfb21g=="
19-
},
20-
"Microsoft.SourceLink.Common": {
21-
"type": "Transitive",
22-
"resolved": "1.1.1",
23-
"contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
24-
},
25-
"Microsoft.SourceLink.GitHub": {
26-
"type": "Transitive",
27-
"resolved": "1.1.1",
28-
"contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
29-
"dependencies": {
30-
"Microsoft.Build.Tasks.Git": "1.1.1",
31-
"Microsoft.SourceLink.Common": "1.1.1"
32-
}
33-
},
34-
"Microsoft.VCRTForwarders.140": {
35-
"type": "Transitive",
36-
"resolved": "1.0.2-rc",
37-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
38-
},
39-
"Microsoft.Windows.SDK.BuildTools": {
40-
"type": "Transitive",
41-
"resolved": "10.0.22621.756",
42-
"contentHash": "7ZL2sFSioYm1Ry067Kw1hg0SCcW5kuVezC2SwjGbcPE61Nn+gTbH86T73G3LcEOVj0S3IZzNuE/29gZvOLS7VA=="
43-
},
44-
"Microsoft.WindowsAppSDK": {
45-
"type": "Transitive",
46-
"resolved": "1.5.240227000",
47-
"contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
48-
"dependencies": {
49-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
50-
}
51-
},
525
"common": {
53-
"type": "Project",
54-
"dependencies": {
55-
"boost": "[1.83.0, )"
56-
}
6+
"type": "Project"
577
},
588
"fmt": {
599
"type": "Project"
6010
},
6111
"folly": {
6212
"type": "Project",
6313
"dependencies": {
64-
"boost": "[1.83.0, )",
6514
"fmt": "[1.0.0, )"
6615
}
6716
},
@@ -70,135 +19,28 @@
7019
"dependencies": {
7120
"Common": "[1.0.0, )",
7221
"Folly": "[1.0.0, )",
73-
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
74-
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
75-
"Microsoft.WindowsAppSDK": "[1.5.240227000, )",
76-
"ReactCommon": "[1.0.0, )",
77-
"boost": "[1.83.0, )"
22+
"ReactCommon": "[1.0.0, )"
7823
}
7924
},
8025
"playground-composition": {
8126
"type": "Project",
8227
"dependencies": {
83-
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
84-
"Microsoft.ReactNative": "[1.0.0, )",
85-
"Microsoft.VCRTForwarders.140": "[1.0.2-rc, )",
86-
"Microsoft.WindowsAppSDK": "[1.5.240227000, )",
87-
"boost": "[1.83.0, )"
28+
"Microsoft.ReactNative": "[1.0.0, )"
8829
}
8930
},
9031
"reactcommon": {
9132
"type": "Project",
9233
"dependencies": {
93-
"Folly": "[1.0.0, )",
94-
"boost": "[1.83.0, )"
34+
"Folly": "[1.0.0, )"
9535
}
9636
}
9737
},
98-
"UAP,Version=v10.0.17763/win10-arm": {
99-
"Microsoft.VCRTForwarders.140": {
100-
"type": "Transitive",
101-
"resolved": "1.0.2-rc",
102-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
103-
},
104-
"Microsoft.WindowsAppSDK": {
105-
"type": "Transitive",
106-
"resolved": "1.5.240227000",
107-
"contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
108-
"dependencies": {
109-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
110-
}
111-
}
112-
},
113-
"UAP,Version=v10.0.17763/win10-arm-aot": {
114-
"Microsoft.VCRTForwarders.140": {
115-
"type": "Transitive",
116-
"resolved": "1.0.2-rc",
117-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
118-
},
119-
"Microsoft.WindowsAppSDK": {
120-
"type": "Transitive",
121-
"resolved": "1.5.240227000",
122-
"contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
123-
"dependencies": {
124-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
125-
}
126-
}
127-
},
128-
"UAP,Version=v10.0.17763/win10-arm64-aot": {
129-
"Microsoft.VCRTForwarders.140": {
130-
"type": "Transitive",
131-
"resolved": "1.0.2-rc",
132-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
133-
},
134-
"Microsoft.WindowsAppSDK": {
135-
"type": "Transitive",
136-
"resolved": "1.5.240227000",
137-
"contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
138-
"dependencies": {
139-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
140-
}
141-
}
142-
},
143-
"UAP,Version=v10.0.17763/win10-x64": {
144-
"Microsoft.VCRTForwarders.140": {
145-
"type": "Transitive",
146-
"resolved": "1.0.2-rc",
147-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
148-
},
149-
"Microsoft.WindowsAppSDK": {
150-
"type": "Transitive",
151-
"resolved": "1.5.240227000",
152-
"contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
153-
"dependencies": {
154-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
155-
}
156-
}
157-
},
158-
"UAP,Version=v10.0.17763/win10-x64-aot": {
159-
"Microsoft.VCRTForwarders.140": {
160-
"type": "Transitive",
161-
"resolved": "1.0.2-rc",
162-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
163-
},
164-
"Microsoft.WindowsAppSDK": {
165-
"type": "Transitive",
166-
"resolved": "1.5.240227000",
167-
"contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
168-
"dependencies": {
169-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
170-
}
171-
}
172-
},
173-
"UAP,Version=v10.0.17763/win10-x86": {
174-
"Microsoft.VCRTForwarders.140": {
175-
"type": "Transitive",
176-
"resolved": "1.0.2-rc",
177-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
178-
},
179-
"Microsoft.WindowsAppSDK": {
180-
"type": "Transitive",
181-
"resolved": "1.5.240227000",
182-
"contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
183-
"dependencies": {
184-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
185-
}
186-
}
187-
},
188-
"UAP,Version=v10.0.17763/win10-x86-aot": {
189-
"Microsoft.VCRTForwarders.140": {
190-
"type": "Transitive",
191-
"resolved": "1.0.2-rc",
192-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
193-
},
194-
"Microsoft.WindowsAppSDK": {
195-
"type": "Transitive",
196-
"resolved": "1.5.240227000",
197-
"contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
198-
"dependencies": {
199-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
200-
}
201-
}
202-
}
38+
"UAP,Version=v10.0.17763/win10-arm": {},
39+
"UAP,Version=v10.0.17763/win10-arm-aot": {},
40+
"UAP,Version=v10.0.17763/win10-arm64-aot": {},
41+
"UAP,Version=v10.0.17763/win10-x64": {},
42+
"UAP,Version=v10.0.17763/win10-x64-aot": {},
43+
"UAP,Version=v10.0.17763/win10-x86": {},
44+
"UAP,Version=v10.0.17763/win10-x86-aot": {}
20345
}
20446
}

‎packages/playground/windows/playground-composition/packages.lock.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@
2828
},
2929
"Microsoft.WindowsAppSDK": {
3030
"type": "Direct",
31-
"requested": "[1.5.240227000, )",
32-
"resolved": "1.5.240227000",
33-
"contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
31+
"requested": "[1.6.240923002, )",
32+
"resolved": "1.6.240923002",
33+
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
3434
"dependencies": {
35+
"Microsoft.Web.WebView2": "1.0.2651.64",
3536
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
3637
}
3738
},
@@ -54,6 +55,11 @@
5455
"Microsoft.SourceLink.Common": "1.1.1"
5556
}
5657
},
58+
"Microsoft.Web.WebView2": {
59+
"type": "Transitive",
60+
"resolved": "1.0.2651.64",
61+
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
62+
},
5763
"Microsoft.Windows.SDK.BuildTools": {
5864
"type": "Transitive",
5965
"resolved": "10.0.22621.756",
@@ -71,8 +77,8 @@
7177
"folly": {
7278
"type": "Project",
7379
"dependencies": {
74-
"boost": "[1.83.0, )",
75-
"fmt": "[1.0.0, )"
80+
"Fmt": "[1.0.0, )",
81+
"boost": "[1.83.0, )"
7682
}
7783
},
7884
"microsoft.reactnative": {
@@ -82,7 +88,7 @@
8288
"Folly": "[1.0.0, )",
8389
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
8490
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
85-
"Microsoft.WindowsAppSDK": "[1.5.240227000, )",
91+
"Microsoft.WindowsAppSDK": "[1.6.240923002, )",
8692
"ReactCommon": "[1.0.0, )",
8793
"boost": "[1.83.0, )"
8894
}

‎vnext/Microsoft.ReactNative/Fabric/Composition/ContentIslandComponentView.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ void ContentIslandComponentView::ConfigureChildSiteLinkAutomation() noexcept {
241241
// This automation mode must be set before connecting the child ContentIsland.
242242
// It puts the child content into a mode where it won't own its own framework root. Instead, the child island's
243243
// automation peers will use the same framework root as the automation peer of this ContentIslandComponentView.
244-
m_childSiteLink.AutomationTreeOption(winrt::Microsoft::UI::Content::AutomationTreeOptions::FragmentBased);
244+
m_childSiteLink.AutomationOption(winrt::Microsoft::UI::Content::ContentAutomationOptions::FragmentBased);
245245

246246
// These events are raised in response to the child ContentIsland asking for providers.
247247
// For example, the ContentIsland.FragmentRootAutomationProvider property will return

0 commit comments

Comments
 (0)