Skip to content

Commit 83f8afd

Browse files
acoates-msacoates-ms
authored
Update WindowsAppSDK version to 1.7.250401001 (#14605)
* Update WindowsAppSDK version to 1.7.250401001 * Change files * Update nuget lock files * more nuget lock file updates * Bump webview props * updated lock files
1 parent 6265574 commit 83f8afd

34 files changed

+331
-694
lines changed

‎change/react-native-windows-2b67676a-4ae8-407a-9c38-e8fec7b38b42.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Update WindowsAppSDK version to 1.7.250401001",
4+
"packageName": "react-native-windows",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

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

Lines changed: 12 additions & 221 deletions
Original file line numberDiff line numberDiff line change
@@ -2,72 +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.Web.WebView2": {
40-
"type": "Transitive",
41-
"resolved": "1.0.2651.64",
42-
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
43-
},
44-
"Microsoft.Windows.SDK.BuildTools": {
45-
"type": "Transitive",
46-
"resolved": "10.0.22621.756",
47-
"contentHash": "7ZL2sFSioYm1Ry067Kw1hg0SCcW5kuVezC2SwjGbcPE61Nn+gTbH86T73G3LcEOVj0S3IZzNuE/29gZvOLS7VA=="
48-
},
49-
"Microsoft.WindowsAppSDK": {
50-
"type": "Transitive",
51-
"resolved": "1.6.240923002",
52-
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
53-
"dependencies": {
54-
"Microsoft.Web.WebView2": "1.0.2651.64",
55-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
56-
}
57-
},
585
"common": {
59-
"type": "Project",
60-
"dependencies": {
61-
"boost": "[1.83.0, )"
62-
}
6+
"type": "Project"
637
},
648
"fmt": {
659
"type": "Project"
6610
},
6711
"folly": {
6812
"type": "Project",
6913
"dependencies": {
70-
"boost": "[1.83.0, )",
7114
"fmt": "[1.0.0, )"
7215
}
7316
},
@@ -76,187 +19,35 @@
7619
"dependencies": {
7720
"Common": "[1.0.0, )",
7821
"Folly": "[1.0.0, )",
79-
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
80-
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
81-
"Microsoft.WindowsAppSDK": "[1.6.240923002, )",
82-
"ReactCommon": "[1.0.0, )",
83-
"boost": "[1.83.0, )"
22+
"ReactCommon": "[1.0.0, )"
8423
}
8524
},
8625
"playground-composition": {
8726
"type": "Project",
8827
"dependencies": {
89-
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
9028
"Microsoft.ReactNative": "[1.0.0, )",
91-
"Microsoft.VCRTForwarders.140": "[1.0.2-rc, )",
92-
"Microsoft.WindowsAppSDK": "[1.6.240923002, )",
93-
"SampleCustomComponent": "[1.0.0, )",
94-
"boost": "[1.83.0, )"
29+
"SampleCustomComponent": "[1.0.0, )"
9530
}
9631
},
9732
"reactcommon": {
9833
"type": "Project",
9934
"dependencies": {
100-
"Folly": "[1.0.0, )",
101-
"boost": "[1.83.0, )"
35+
"Folly": "[1.0.0, )"
10236
}
10337
},
10438
"samplecustomcomponent": {
10539
"type": "Project",
10640
"dependencies": {
107-
"Microsoft.ReactNative": "[1.0.0, )",
108-
"Microsoft.VCRTForwarders.140": "[1.0.2-rc, )",
109-
"Microsoft.WindowsAppSDK": "[1.6.240923002, )",
110-
"boost": "[1.83.0, )"
111-
}
112-
}
113-
},
114-
"UAP,Version=v10.0.17763/win10-arm": {
115-
"Microsoft.VCRTForwarders.140": {
116-
"type": "Transitive",
117-
"resolved": "1.0.2-rc",
118-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
119-
},
120-
"Microsoft.Web.WebView2": {
121-
"type": "Transitive",
122-
"resolved": "1.0.2651.64",
123-
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
124-
},
125-
"Microsoft.WindowsAppSDK": {
126-
"type": "Transitive",
127-
"resolved": "1.6.240923002",
128-
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
129-
"dependencies": {
130-
"Microsoft.Web.WebView2": "1.0.2651.64",
131-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
132-
}
133-
}
134-
},
135-
"UAP,Version=v10.0.17763/win10-arm-aot": {
136-
"Microsoft.VCRTForwarders.140": {
137-
"type": "Transitive",
138-
"resolved": "1.0.2-rc",
139-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
140-
},
141-
"Microsoft.Web.WebView2": {
142-
"type": "Transitive",
143-
"resolved": "1.0.2651.64",
144-
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
145-
},
146-
"Microsoft.WindowsAppSDK": {
147-
"type": "Transitive",
148-
"resolved": "1.6.240923002",
149-
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
150-
"dependencies": {
151-
"Microsoft.Web.WebView2": "1.0.2651.64",
152-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
153-
}
154-
}
155-
},
156-
"UAP,Version=v10.0.17763/win10-arm64-aot": {
157-
"Microsoft.VCRTForwarders.140": {
158-
"type": "Transitive",
159-
"resolved": "1.0.2-rc",
160-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
161-
},
162-
"Microsoft.Web.WebView2": {
163-
"type": "Transitive",
164-
"resolved": "1.0.2651.64",
165-
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
166-
},
167-
"Microsoft.WindowsAppSDK": {
168-
"type": "Transitive",
169-
"resolved": "1.6.240923002",
170-
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
171-
"dependencies": {
172-
"Microsoft.Web.WebView2": "1.0.2651.64",
173-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
174-
}
175-
}
176-
},
177-
"UAP,Version=v10.0.17763/win10-x64": {
178-
"Microsoft.VCRTForwarders.140": {
179-
"type": "Transitive",
180-
"resolved": "1.0.2-rc",
181-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
182-
},
183-
"Microsoft.Web.WebView2": {
184-
"type": "Transitive",
185-
"resolved": "1.0.2651.64",
186-
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
187-
},
188-
"Microsoft.WindowsAppSDK": {
189-
"type": "Transitive",
190-
"resolved": "1.6.240923002",
191-
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
192-
"dependencies": {
193-
"Microsoft.Web.WebView2": "1.0.2651.64",
194-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
195-
}
196-
}
197-
},
198-
"UAP,Version=v10.0.17763/win10-x64-aot": {
199-
"Microsoft.VCRTForwarders.140": {
200-
"type": "Transitive",
201-
"resolved": "1.0.2-rc",
202-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
203-
},
204-
"Microsoft.Web.WebView2": {
205-
"type": "Transitive",
206-
"resolved": "1.0.2651.64",
207-
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
208-
},
209-
"Microsoft.WindowsAppSDK": {
210-
"type": "Transitive",
211-
"resolved": "1.6.240923002",
212-
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
213-
"dependencies": {
214-
"Microsoft.Web.WebView2": "1.0.2651.64",
215-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
41+
"Microsoft.ReactNative": "[1.0.0, )"
21642
}
21743
}
21844
},
219-
"UAP,Version=v10.0.17763/win10-x86": {
220-
"Microsoft.VCRTForwarders.140": {
221-
"type": "Transitive",
222-
"resolved": "1.0.2-rc",
223-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
224-
},
225-
"Microsoft.Web.WebView2": {
226-
"type": "Transitive",
227-
"resolved": "1.0.2651.64",
228-
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
229-
},
230-
"Microsoft.WindowsAppSDK": {
231-
"type": "Transitive",
232-
"resolved": "1.6.240923002",
233-
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
234-
"dependencies": {
235-
"Microsoft.Web.WebView2": "1.0.2651.64",
236-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
237-
}
238-
}
239-
},
240-
"UAP,Version=v10.0.17763/win10-x86-aot": {
241-
"Microsoft.VCRTForwarders.140": {
242-
"type": "Transitive",
243-
"resolved": "1.0.2-rc",
244-
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
245-
},
246-
"Microsoft.Web.WebView2": {
247-
"type": "Transitive",
248-
"resolved": "1.0.2651.64",
249-
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
250-
},
251-
"Microsoft.WindowsAppSDK": {
252-
"type": "Transitive",
253-
"resolved": "1.6.240923002",
254-
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
255-
"dependencies": {
256-
"Microsoft.Web.WebView2": "1.0.2651.64",
257-
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
258-
}
259-
}
260-
}
45+
"UAP,Version=v10.0.17763/win10-arm": {},
46+
"UAP,Version=v10.0.17763/win10-arm-aot": {},
47+
"UAP,Version=v10.0.17763/win10-arm64-aot": {},
48+
"UAP,Version=v10.0.17763/win10-x64": {},
49+
"UAP,Version=v10.0.17763/win10-x64-aot": {},
50+
"UAP,Version=v10.0.17763/win10-x86": {},
51+
"UAP,Version=v10.0.17763/win10-x86-aot": {}
26152
}
26253
}

‎packages/playground/windows/playground-composition/CustomComponent.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,17 @@ struct CustomComponentUserData : winrt::implements<CustomComponentUserData, winr
8383
bool nativeLayout) {
8484
nativeLayout;
8585
islandView;
86-
#ifdef USE_EXPERIMENTAL_WINUI3
8786
m_xamlIsland = winrt::Microsoft::UI::Xaml::XamlIsland{};
8887
m_xamlIsland.Content(CreateXamlButtonContent(nativeLayout));
8988
islandView.Connect(m_xamlIsland.ContentIsland());
90-
#endif
9189
}
9290

9391
void PropsChanged(
9492
const winrt::Microsoft::ReactNative::Composition::ContentIslandComponentView & /*islandView*/,
9593
const winrt::Microsoft::ReactNative::IComponentProps &newProps,
9694
const winrt::Microsoft::ReactNative::IComponentProps & /*oldProps*/) {
9795
auto myProps = newProps.as<CustomXamlComponentProps>();
98-
#ifdef USE_EXPERIMENTAL_WINUI3
9996
m_buttonLabelTextBlock.Text(myProps->label);
100-
#endif
10197
}
10298

10399
void FinalizeUpdates() noexcept {
@@ -167,13 +163,11 @@ struct CustomComponentUserData : winrt::implements<CustomComponentUserData, winr
167163
userData->Initialize(islandView, nativeLayout);
168164
islandView.UserData(*userData);
169165

170-
#ifdef USE_EXPERIMENTAL_WINUI3
171166
islandView.Destroying([](const winrt::IInspectable &sender, const winrt::IInspectable & /*args*/) {
172167
auto senderIslandView = sender.as<winrt::Microsoft::ReactNative::Composition::ContentIslandComponentView>();
173168
auto userData = senderIslandView.UserData().as<CustomComponentUserData>();
174169
userData->m_xamlIsland.Close();
175170
});
176-
#endif
177171
});
178172

179173
builder.SetUpdateEventEmitterHandler([](const winrt::Microsoft::ReactNative::ComponentView &source,
@@ -231,9 +225,7 @@ struct CustomComponentUserData : winrt::implements<CustomComponentUserData, winr
231225
winrt::Microsoft::UI::Xaml::Controls::TextBlock m_buttonLabelTextBlock{nullptr};
232226
winrt::Microsoft::ReactNative::IComponentState m_state;
233227
std::unique_ptr<CustomXamlComponentEventEmitter> m_eventEmitter{nullptr};
234-
#ifdef USE_EXPERIMENTAL_WINUI3
235228
winrt::Microsoft::UI::Xaml::XamlIsland m_xamlIsland{nullptr};
236-
#endif
237229
};
238230

239231
static void RegisterViewComponent(winrt::Microsoft::ReactNative::IReactPackageBuilder const &packageBuilder) {

‎packages/playground/windows/playground-composition/Playground-Composition.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,7 @@ struct CompReactPackageProvider
104104
: winrt::implements<CompReactPackageProvider, winrt::Microsoft::ReactNative::IReactPackageProvider> {
105105
public: // IReactPackageProvider
106106
void CreatePackage(winrt::Microsoft::ReactNative::IReactPackageBuilder const &packageBuilder) noexcept {
107-
#ifdef USE_EXPERIMENTAL_WINUI3
108107
RegisterCustomComponent(packageBuilder);
109-
#else
110-
UNREFERENCED_PARAMETER(packageBuilder);
111-
#endif // USE_EXPERIMENTAL_WINUI3
112108
}
113109
};
114110

@@ -716,12 +712,9 @@ _Use_decl_annotations_ int CALLBACK WinMain(HINSTANCE instance, HINSTANCE, PSTR
716712
winrt::Microsoft::UI::Dispatching::DispatcherQueueController::CreateOnCurrentThread();
717713
g_liftedCompositor = winrt::Microsoft::UI::Composition::Compositor();
718714

719-
// We only want to init XAML if we are using XAML islands
720-
#ifdef USE_EXPERIMENTAL_WINUI3
721715
// Island-support: Create our custom Xaml App object. This is needed to properly use the controls and metadata
722716
// in Microsoft.ui.xaml.controls.dll.
723717
auto playgroundApp{winrt::make<winrt::Playground::implementation::App>()};
724-
#endif
725718

726719
return RunPlayground(showCmd, false);
727720
}

0 commit comments

Comments
 (0)