Skip to content

Update WindowsAppSDK version to 1.7.250401001 #14605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 22, 2025
Merged

Update WindowsAppSDK version to 1.7.250401001 #14605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0e32b71
Update WindowsAppSDK version to 1.7.250401001
acoates-ms Apr 22, 2025
37be08d
Change files
acoates-ms Apr 22, 2025
6135ed4
Update nuget lock files
acoates-ms Apr 22, 2025
589aa64
more nuget lock file updates
acoates-ms Apr 22, 2025
7692913
Merge branch 'main' into bumpwasdk
acoates-ms Apr 22, 2025
8bd7285
Bump webview props
acoates-ms Apr 22, 2025
97abd32
updated lock files
acoates-ms Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/react-native-windows-2b67676a-4ae8-407a-9c38-e8fec7b38b42.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Update WindowsAppSDK version to 1.7.250401001",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
233 changes: 12 additions & 221 deletions packages/playground/windows/playground-composition.Package/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,72 +2,15 @@
"version": 1,
"dependencies": {
"UAP,Version=v10.0.17763": {
"boost": {
"type": "Transitive",
"resolved": "1.83.0",
"contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ=="
},
"Microsoft.Build.Tasks.Git": {
"type": "Transitive",
"resolved": "1.1.1",
"contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
},
"Microsoft.JavaScript.Hermes": {
"type": "Transitive",
"resolved": "0.1.23",
"contentHash": "cA9t1GjY4Yo0JD1AfA//e1lOwk48hLANfuX6GXrikmEBNZVr2TIX5ONJt5tqCnpZyLz6xGiPDgTfFNKbSfb21g=="
},
"Microsoft.SourceLink.Common": {
"type": "Transitive",
"resolved": "1.1.1",
"contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
},
"Microsoft.SourceLink.GitHub": {
"type": "Transitive",
"resolved": "1.1.1",
"contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
"dependencies": {
"Microsoft.Build.Tasks.Git": "1.1.1",
"Microsoft.SourceLink.Common": "1.1.1"
}
},
"Microsoft.VCRTForwarders.140": {
"type": "Transitive",
"resolved": "1.0.2-rc",
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
"resolved": "1.0.2651.64",
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
},
"Microsoft.Windows.SDK.BuildTools": {
"type": "Transitive",
"resolved": "10.0.22621.756",
"contentHash": "7ZL2sFSioYm1Ry067Kw1hg0SCcW5kuVezC2SwjGbcPE61Nn+gTbH86T73G3LcEOVj0S3IZzNuE/29gZvOLS7VA=="
},
"Microsoft.WindowsAppSDK": {
"type": "Transitive",
"resolved": "1.6.240923002",
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
"dependencies": {
"Microsoft.Web.WebView2": "1.0.2651.64",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
}
},
"common": {
"type": "Project",
"dependencies": {
"boost": "[1.83.0, )"
}
"type": "Project"
},
"fmt": {
"type": "Project"
},
"folly": {
"type": "Project",
"dependencies": {
"boost": "[1.83.0, )",
"fmt": "[1.0.0, )"
}
},
Expand All @@ -76,187 +19,35 @@
"dependencies": {
"Common": "[1.0.0, )",
"Folly": "[1.0.0, )",
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
"Microsoft.WindowsAppSDK": "[1.6.240923002, )",
"ReactCommon": "[1.0.0, )",
"boost": "[1.83.0, )"
"ReactCommon": "[1.0.0, )"
}
},
"playground-composition": {
"type": "Project",
"dependencies": {
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
"Microsoft.ReactNative": "[1.0.0, )",
"Microsoft.VCRTForwarders.140": "[1.0.2-rc, )",
"Microsoft.WindowsAppSDK": "[1.6.240923002, )",
"SampleCustomComponent": "[1.0.0, )",
"boost": "[1.83.0, )"
"SampleCustomComponent": "[1.0.0, )"
}
},
"reactcommon": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )",
"boost": "[1.83.0, )"
"Folly": "[1.0.0, )"
}
},
"samplecustomcomponent": {
"type": "Project",
"dependencies": {
"Microsoft.ReactNative": "[1.0.0, )",
"Microsoft.VCRTForwarders.140": "[1.0.2-rc, )",
"Microsoft.WindowsAppSDK": "[1.6.240923002, )",
"boost": "[1.83.0, )"
}
}
},
"UAP,Version=v10.0.17763/win10-arm": {
"Microsoft.VCRTForwarders.140": {
"type": "Transitive",
"resolved": "1.0.2-rc",
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
"resolved": "1.0.2651.64",
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
},
"Microsoft.WindowsAppSDK": {
"type": "Transitive",
"resolved": "1.6.240923002",
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
"dependencies": {
"Microsoft.Web.WebView2": "1.0.2651.64",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
}
}
},
"UAP,Version=v10.0.17763/win10-arm-aot": {
"Microsoft.VCRTForwarders.140": {
"type": "Transitive",
"resolved": "1.0.2-rc",
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
"resolved": "1.0.2651.64",
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
},
"Microsoft.WindowsAppSDK": {
"type": "Transitive",
"resolved": "1.6.240923002",
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
"dependencies": {
"Microsoft.Web.WebView2": "1.0.2651.64",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
}
}
},
"UAP,Version=v10.0.17763/win10-arm64-aot": {
"Microsoft.VCRTForwarders.140": {
"type": "Transitive",
"resolved": "1.0.2-rc",
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
"resolved": "1.0.2651.64",
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
},
"Microsoft.WindowsAppSDK": {
"type": "Transitive",
"resolved": "1.6.240923002",
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
"dependencies": {
"Microsoft.Web.WebView2": "1.0.2651.64",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
}
}
},
"UAP,Version=v10.0.17763/win10-x64": {
"Microsoft.VCRTForwarders.140": {
"type": "Transitive",
"resolved": "1.0.2-rc",
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
"resolved": "1.0.2651.64",
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
},
"Microsoft.WindowsAppSDK": {
"type": "Transitive",
"resolved": "1.6.240923002",
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
"dependencies": {
"Microsoft.Web.WebView2": "1.0.2651.64",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
}
}
},
"UAP,Version=v10.0.17763/win10-x64-aot": {
"Microsoft.VCRTForwarders.140": {
"type": "Transitive",
"resolved": "1.0.2-rc",
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
"resolved": "1.0.2651.64",
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
},
"Microsoft.WindowsAppSDK": {
"type": "Transitive",
"resolved": "1.6.240923002",
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
"dependencies": {
"Microsoft.Web.WebView2": "1.0.2651.64",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
"Microsoft.ReactNative": "[1.0.0, )"
}
}
},
"UAP,Version=v10.0.17763/win10-x86": {
"Microsoft.VCRTForwarders.140": {
"type": "Transitive",
"resolved": "1.0.2-rc",
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
"resolved": "1.0.2651.64",
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
},
"Microsoft.WindowsAppSDK": {
"type": "Transitive",
"resolved": "1.6.240923002",
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
"dependencies": {
"Microsoft.Web.WebView2": "1.0.2651.64",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
}
}
},
"UAP,Version=v10.0.17763/win10-x86-aot": {
"Microsoft.VCRTForwarders.140": {
"type": "Transitive",
"resolved": "1.0.2-rc",
"contentHash": "/r+sjtEeCIGyDhobIZ5hSmYhC/dSyGZxf1SxYJpElUhB0LMCktOMFs9gXrauXypIFECpVynNyVjAmJt6hjJ5oQ=="
},
"Microsoft.Web.WebView2": {
"type": "Transitive",
"resolved": "1.0.2651.64",
"contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
},
"Microsoft.WindowsAppSDK": {
"type": "Transitive",
"resolved": "1.6.240923002",
"contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
"dependencies": {
"Microsoft.Web.WebView2": "1.0.2651.64",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
}
}
}
"UAP,Version=v10.0.17763/win10-arm": {},
"UAP,Version=v10.0.17763/win10-arm-aot": {},
"UAP,Version=v10.0.17763/win10-arm64-aot": {},
"UAP,Version=v10.0.17763/win10-x64": {},
"UAP,Version=v10.0.17763/win10-x64-aot": {},
"UAP,Version=v10.0.17763/win10-x86": {},
"UAP,Version=v10.0.17763/win10-x86-aot": {}
}
}
8 changes: 0 additions & 8 deletions packages/playground/windows/playground-composition/CustomComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,21 +83,17 @@ struct CustomComponentUserData : winrt::implements<CustomComponentUserData, winr
bool nativeLayout) {
nativeLayout;
islandView;
#ifdef USE_EXPERIMENTAL_WINUI3
m_xamlIsland = winrt::Microsoft::UI::Xaml::XamlIsland{};
m_xamlIsland.Content(CreateXamlButtonContent(nativeLayout));
islandView.Connect(m_xamlIsland.ContentIsland());
#endif
}

void PropsChanged(
const winrt::Microsoft::ReactNative::Composition::ContentIslandComponentView & /*islandView*/,
const winrt::Microsoft::ReactNative::IComponentProps &newProps,
const winrt::Microsoft::ReactNative::IComponentProps & /*oldProps*/) {
auto myProps = newProps.as<CustomXamlComponentProps>();
#ifdef USE_EXPERIMENTAL_WINUI3
m_buttonLabelTextBlock.Text(myProps->label);
#endif
}

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

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

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

static void RegisterViewComponent(winrt::Microsoft::ReactNative::IReactPackageBuilder const &packageBuilder) {
Expand Down
7 changes: 0 additions & 7 deletions packages/playground/windows/playground-composition/Playground-Composition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,7 @@ struct CompReactPackageProvider
: winrt::implements<CompReactPackageProvider, winrt::Microsoft::ReactNative::IReactPackageProvider> {
public: // IReactPackageProvider
void CreatePackage(winrt::Microsoft::ReactNative::IReactPackageBuilder const &packageBuilder) noexcept {
#ifdef USE_EXPERIMENTAL_WINUI3
RegisterCustomComponent(packageBuilder);
#else
UNREFERENCED_PARAMETER(packageBuilder);
#endif // USE_EXPERIMENTAL_WINUI3
}
};

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

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

return RunPlayground(showCmd, false);
}
Loading
Loading