Update WindowsAppSDK to 1.8#32174
Conversation
There was a problem hiding this comment.
Pull Request Overview
This PR updates the Windows App SDK from version 1.7 to 1.8 and modernizes Windows platform support across multiple projects. The update addresses issue #30858 by ensuring consistent Windows SDK versions and proper package references.
Key changes:
- Updated Windows App SDK to version 1.8.251003001 and Windows SDK Build Tools to 10.0.26100.4654
- Added
Microsoft.WindowsAppSDKpackage reference to graphics and essentials projects for consistent Windows support - Fixed asset path handling in Windows integration tests to accommodate both RID-graph and non-RID-graph scenarios
Reviewed Changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| eng/Versions.props | Updated Windows App SDK and Build Tools package versions to latest releases |
| src/Essentials/src/Essentials.csproj | Added Microsoft.WindowsAppSDK package reference for Windows platform support |
| src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj | Added Microsoft.WindowsAppSDK package reference for Windows builds |
| src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj | Added Microsoft.WindowsAppSDK package reference for consistency |
| src/Graphics/src/Graphics/Graphics.csproj | Added duplicate Microsoft.WindowsAppSDK package reference |
| src/Controls/src/Xaml/Controls.Xaml.csproj | Removed Windows-specific DefineConstants and PRI generation properties |
| Directory.Build.targets | Added empty TypeScript targets to prevent unwanted output handling during publish |
| src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs | Modified RID path construction to handle both RID-graph and non-RID-graph scenarios |
src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs
Show resolved
Hide resolved
56262f0 to
0609452
Compare
|
c317c16 to
64ada7e
Compare
|
Need to wait for microsoft/WindowsAppSDK#5820 i think... |
|
New WASDK version released: 1.8.3 (1.8.251106002) |
|
/rebase |
f55a405 to
65c367b
Compare
|
/rebase |
65c367b to
1c966d4
Compare
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
# Conflicts: # Directory.Build.targets
1c966d4 to
ee137ca
Compare
This pull request updates several project files to improve Windows platform support and modernize dependencies. The main changes involve updating Windows SDK package versions, adding the `Microsoft.WindowsAppSDK` package to relevant projects, and making adjustments for publishing and output handling. Fixes #30858 Attempt 1 #30665 Attempt 2 #31281 **Dependency updates:** * Updated `MicrosoftWindowsAppSDKPackageVersion` to `1.8.251003001` and `MicrosoftWindowsSDKBuildToolsPackageVersion` to `10.0.26100.4654` in `eng/Versions.props`, ensuring projects use the latest Windows SDKs. **Project file improvements for Windows support:** * Added `Microsoft.WindowsAppSDK` as a `PackageReference` to `Essentials.csproj`, `Graphics.Skia.csproj`, `Graphics.Win2D.csproj`, and duplicated in `Graphics.csproj` to ensure consistent Windows App SDK usage across graphics and essentials projects. [[1]](diffhunk://#diff-f243c2b1e6b28c505c27e07d7cb7a99764386669ce229c6b856c32ca67faaf00R42) [[2]](diffhunk://#diff-f23bffcd581d332998a68c42c65149fa447d2d3bed3d3c0ebf458e279f51e8dfR37) [[3]](diffhunk://#diff-dc41b78aa310aeed937c387045a62fb5f2ae3ce0ce3bb304a7c21782d30c25a6R30) [[4]](diffhunk://#diff-008ec03ba4c24598765341193edb331fec925e36d0f68e4d1bcbbea940790f9dR43) * Removed Windows-specific property settings from `Controls.Xaml.csproj`, simplifying project configuration for Windows builds. **Build and publishing process adjustments:** * Added new MSBuild targets (`GetTypeScriptOutputForPublishing`, `GetTypeScriptCopyToOutputDirectoryItems`) in `Directory.Build.targets` to improve TypeScript output handling during publishing. * Updated asset path logic in `WindowsTemplateTest.cs` to better handle runtime identifier (RID) directories when publishing packaged Windows apps. --------- Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
This pull request updates several project files to improve Windows platform support and modernize dependencies. The main changes involve updating Windows SDK package versions, adding the `Microsoft.WindowsAppSDK` package to relevant projects, and making adjustments for publishing and output handling. Fixes #30858 Attempt 1 #30665 Attempt 2 #31281 **Dependency updates:** * Updated `MicrosoftWindowsAppSDKPackageVersion` to `1.8.251003001` and `MicrosoftWindowsSDKBuildToolsPackageVersion` to `10.0.26100.4654` in `eng/Versions.props`, ensuring projects use the latest Windows SDKs. **Project file improvements for Windows support:** * Added `Microsoft.WindowsAppSDK` as a `PackageReference` to `Essentials.csproj`, `Graphics.Skia.csproj`, `Graphics.Win2D.csproj`, and duplicated in `Graphics.csproj` to ensure consistent Windows App SDK usage across graphics and essentials projects. [[1]](diffhunk://#diff-f243c2b1e6b28c505c27e07d7cb7a99764386669ce229c6b856c32ca67faaf00R42) [[2]](diffhunk://#diff-f23bffcd581d332998a68c42c65149fa447d2d3bed3d3c0ebf458e279f51e8dfR37) [[3]](diffhunk://#diff-dc41b78aa310aeed937c387045a62fb5f2ae3ce0ce3bb304a7c21782d30c25a6R30) [[4]](diffhunk://#diff-008ec03ba4c24598765341193edb331fec925e36d0f68e4d1bcbbea940790f9dR43) * Removed Windows-specific property settings from `Controls.Xaml.csproj`, simplifying project configuration for Windows builds. **Build and publishing process adjustments:** * Added new MSBuild targets (`GetTypeScriptOutputForPublishing`, `GetTypeScriptCopyToOutputDirectoryItems`) in `Directory.Build.targets` to improve TypeScript output handling during publishing. * Updated asset path logic in `WindowsTemplateTest.cs` to better handle runtime identifier (RID) directories when publishing packaged Windows apps. --------- Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
This pull request updates several project files to improve Windows platform support and modernize dependencies. The main changes involve updating Windows SDK package versions, adding the `Microsoft.WindowsAppSDK` package to relevant projects, and making adjustments for publishing and output handling. Fixes #30858 Attempt 1 #30665 Attempt 2 #31281 **Dependency updates:** * Updated `MicrosoftWindowsAppSDKPackageVersion` to `1.8.251003001` and `MicrosoftWindowsSDKBuildToolsPackageVersion` to `10.0.26100.4654` in `eng/Versions.props`, ensuring projects use the latest Windows SDKs. **Project file improvements for Windows support:** * Added `Microsoft.WindowsAppSDK` as a `PackageReference` to `Essentials.csproj`, `Graphics.Skia.csproj`, `Graphics.Win2D.csproj`, and duplicated in `Graphics.csproj` to ensure consistent Windows App SDK usage across graphics and essentials projects. [[1]](diffhunk://#diff-f243c2b1e6b28c505c27e07d7cb7a99764386669ce229c6b856c32ca67faaf00R42) [[2]](diffhunk://#diff-f23bffcd581d332998a68c42c65149fa447d2d3bed3d3c0ebf458e279f51e8dfR37) [[3]](diffhunk://#diff-dc41b78aa310aeed937c387045a62fb5f2ae3ce0ce3bb304a7c21782d30c25a6R30) [[4]](diffhunk://#diff-008ec03ba4c24598765341193edb331fec925e36d0f68e4d1bcbbea940790f9dR43) * Removed Windows-specific property settings from `Controls.Xaml.csproj`, simplifying project configuration for Windows builds. **Build and publishing process adjustments:** * Added new MSBuild targets (`GetTypeScriptOutputForPublishing`, `GetTypeScriptCopyToOutputDirectoryItems`) in `Directory.Build.targets` to improve TypeScript output handling during publishing. * Updated asset path logic in `WindowsTemplateTest.cs` to better handle runtime identifier (RID) directories when publishing packaged Windows apps. --------- Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
This pull request updates several project files to improve Windows platform support and modernize dependencies. The main changes involve updating Windows SDK package versions, adding the `Microsoft.WindowsAppSDK` package to relevant projects, and making adjustments for publishing and output handling. Fixes #30858 Attempt 1 #30665 Attempt 2 #31281 **Dependency updates:** * Updated `MicrosoftWindowsAppSDKPackageVersion` to `1.8.251003001` and `MicrosoftWindowsSDKBuildToolsPackageVersion` to `10.0.26100.4654` in `eng/Versions.props`, ensuring projects use the latest Windows SDKs. **Project file improvements for Windows support:** * Added `Microsoft.WindowsAppSDK` as a `PackageReference` to `Essentials.csproj`, `Graphics.Skia.csproj`, `Graphics.Win2D.csproj`, and duplicated in `Graphics.csproj` to ensure consistent Windows App SDK usage across graphics and essentials projects. [[1]](diffhunk://#diff-f243c2b1e6b28c505c27e07d7cb7a99764386669ce229c6b856c32ca67faaf00R42) [[2]](diffhunk://#diff-f23bffcd581d332998a68c42c65149fa447d2d3bed3d3c0ebf458e279f51e8dfR37) [[3]](diffhunk://#diff-dc41b78aa310aeed937c387045a62fb5f2ae3ce0ce3bb304a7c21782d30c25a6R30) [[4]](diffhunk://#diff-008ec03ba4c24598765341193edb331fec925e36d0f68e4d1bcbbea940790f9dR43) * Removed Windows-specific property settings from `Controls.Xaml.csproj`, simplifying project configuration for Windows builds. **Build and publishing process adjustments:** * Added new MSBuild targets (`GetTypeScriptOutputForPublishing`, `GetTypeScriptCopyToOutputDirectoryItems`) in `Directory.Build.targets` to improve TypeScript output handling during publishing. * Updated asset path logic in `WindowsTemplateTest.cs` to better handle runtime identifier (RID) directories when publishing packaged Windows apps. --------- Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
This pull request updates several project files to improve Windows platform support and modernize dependencies. The main changes involve updating Windows SDK package versions, adding the `Microsoft.WindowsAppSDK` package to relevant projects, and making adjustments for publishing and output handling. Fixes #30858 Attempt 1 #30665 Attempt 2 #31281 **Dependency updates:** * Updated `MicrosoftWindowsAppSDKPackageVersion` to `1.8.251003001` and `MicrosoftWindowsSDKBuildToolsPackageVersion` to `10.0.26100.4654` in `eng/Versions.props`, ensuring projects use the latest Windows SDKs. **Project file improvements for Windows support:** * Added `Microsoft.WindowsAppSDK` as a `PackageReference` to `Essentials.csproj`, `Graphics.Skia.csproj`, `Graphics.Win2D.csproj`, and duplicated in `Graphics.csproj` to ensure consistent Windows App SDK usage across graphics and essentials projects. [[1]](diffhunk://#diff-f243c2b1e6b28c505c27e07d7cb7a99764386669ce229c6b856c32ca67faaf00R42) [[2]](diffhunk://#diff-f23bffcd581d332998a68c42c65149fa447d2d3bed3d3c0ebf458e279f51e8dfR37) [[3]](diffhunk://#diff-dc41b78aa310aeed937c387045a62fb5f2ae3ce0ce3bb304a7c21782d30c25a6R30) [[4]](diffhunk://#diff-008ec03ba4c24598765341193edb331fec925e36d0f68e4d1bcbbea940790f9dR43) * Removed Windows-specific property settings from `Controls.Xaml.csproj`, simplifying project configuration for Windows builds. **Build and publishing process adjustments:** * Added new MSBuild targets (`GetTypeScriptOutputForPublishing`, `GetTypeScriptCopyToOutputDirectoryItems`) in `Directory.Build.targets` to improve TypeScript output handling during publishing. * Updated asset path logic in `WindowsTemplateTest.cs` to better handle runtime identifier (RID) directories when publishing packaged Windows apps. --------- Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
This pull request updates several project files to improve Windows platform support and modernize dependencies. The main changes involve updating Windows SDK package versions, adding the `Microsoft.WindowsAppSDK` package to relevant projects, and making adjustments for publishing and output handling. Fixes #30858 Attempt 1 #30665 Attempt 2 #31281 **Dependency updates:** * Updated `MicrosoftWindowsAppSDKPackageVersion` to `1.8.251003001` and `MicrosoftWindowsSDKBuildToolsPackageVersion` to `10.0.26100.4654` in `eng/Versions.props`, ensuring projects use the latest Windows SDKs. **Project file improvements for Windows support:** * Added `Microsoft.WindowsAppSDK` as a `PackageReference` to `Essentials.csproj`, `Graphics.Skia.csproj`, `Graphics.Win2D.csproj`, and duplicated in `Graphics.csproj` to ensure consistent Windows App SDK usage across graphics and essentials projects. [[1]](diffhunk://#diff-f243c2b1e6b28c505c27e07d7cb7a99764386669ce229c6b856c32ca67faaf00R42) [[2]](diffhunk://#diff-f23bffcd581d332998a68c42c65149fa447d2d3bed3d3c0ebf458e279f51e8dfR37) [[3]](diffhunk://#diff-dc41b78aa310aeed937c387045a62fb5f2ae3ce0ce3bb304a7c21782d30c25a6R30) [[4]](diffhunk://#diff-008ec03ba4c24598765341193edb331fec925e36d0f68e4d1bcbbea940790f9dR43) * Removed Windows-specific property settings from `Controls.Xaml.csproj`, simplifying project configuration for Windows builds. **Build and publishing process adjustments:** * Added new MSBuild targets (`GetTypeScriptOutputForPublishing`, `GetTypeScriptCopyToOutputDirectoryItems`) in `Directory.Build.targets` to improve TypeScript output handling during publishing. * Updated asset path logic in `WindowsTemplateTest.cs` to better handle runtime identifier (RID) directories when publishing packaged Windows apps. --------- Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
## What's Coming .NET MAUI inflight/candidate introduces significant improvements across all platforms with focus on quality, performance, and developer experience. This release includes 27 commits with various improvements, bug fixes, and enhancements. ## CollectionView - [iOS][CV2] Fix page can be dragged down, and it would cause an extra space between Header and EmptyView text by @devanathan-vaithiyanathan in #31840 <details> <summary>🔧 Fixes</summary> - [I8_Header_and_Footer_Null - The page can be dragged down, and it would cause an extra space between Header and EmptyView text.](#31465) </details> - [iOS] Fixed the Items not displayed properly in CarouselView2 by @Ahamed-Ali in #31336 <details> <summary>🔧 Fixes</summary> - [[iOS] Items are not updated properly in CarouselView2.](#31148) </details> ## Docs - Improve Controls Core API docs by @jfversluis in #33240 ## Editor - [iOS] Fixed an issue where an Editor with a small height inside a ScrollView would cause the entire page to scroll by @Tamilarasan-Paranthaman in #27948 <details> <summary>🔧 Fixes</summary> - [[iOS][Editor] An Editor that has not enough height and resides inside a ScrollView/CollectionView will scroll the entire page](#27750) </details> ## Image - [Android] Image control crashes on Android when image width exceeds height by @KarthikRajaKalaimani in #33045 <details> <summary>🔧 Fixes</summary> - [Image control crashes on Android when image width exceeds height](#32869) </details> ## Mediapicker - [Android 🤖] Add a log telling why the request is cancelled by @pictos in #33295 <details> <summary>🔧 Fixes</summary> - [MediaPicker.PickPhotosAsync throwing TaskCancelledException in net10-android](#33283) </details> ## Navigation - [Android] Fix for App Hang When PopModalAsync Is Called Immediately After PushModalAsync with Task.Yield() by @BagavathiPerumal in #32479 <details> <summary>🔧 Fixes</summary> - [App hangs if PopModalAsync is called after PushModalAsync with single await Task.Yield()](#32310) </details> - [iOS 26] Navigation hangs after rapidly open and closing new page using Navigation.PushAsync - fix by @kubaflo in #32456 <details> <summary>🔧 Fixes</summary> - [[iOS 26] Navigation hangs after rapidly open and closing new page using Navigation.PushAsync](#32425) </details> ## Pages - [iOS] Fix ContentPage BackgroundImageSource not working by @Shalini-Ashokan in #33297 <details> <summary>🔧 Fixes</summary> - [.Net MAUI- Page.BackgroundImageSource not working for iOS](#21594) </details> ## RadioButton - [Issue-Resolver] Fix #33264 - RadioButtonGroup not working with Collection View by @kubaflo in #33343 <details> <summary>🔧 Fixes</summary> - [RadioButtonGroup not working with CollectionView](#33264) </details> ## SafeArea - [Android] Fixed Label Overlapped by Android Status Bar When Using SafeAreaEdges="Container" in .NET MAUI by @NirmalKumarYuvaraj in #33285 <details> <summary>🔧 Fixes</summary> - [SafeAreaEdges works correctly only on the first tab in Shell. Other tabs have content colliding with the display cutout in the landscape mode.](#33034) - [Label Overlapped by Android Status Bar When Using SafeAreaEdges="Container" in .NET MAUI](#32941) - [[MAUI 10] Layout breaks on first navigation (Shell // route) until soft keyboard appears/disappears (Android + iOS)](#33038) </details> ## ScrollView - [Windows, Android] Fix ScrollView Content Not Removed When Set to Null by @devanathan-vaithiyanathan in #33069 <details> <summary>🔧 Fixes</summary> - [[Windows, Android] ScrollView Content Not Removed When Set to Null](#33067) </details> ## Searchbar - Fix Android crash when changing shared Drawable tint on Searchbar by @tritter in #33071 <details> <summary>🔧 Fixes</summary> - [[Android] Crash on changing Tint of Searchbar](#33070) </details> ## Shell - [iOS] - Fix Custom FlyoutIcon from Being Overridden to Default Color in Shell by @prakashKannanSf3972 in #27580 <details> <summary>🔧 Fixes</summary> - [Change the flyout icon color](#6738) </details> - [iOS] Fix Shell NavBarIsVisible updates when switching ShellContent by @Vignesh-SF3580 in #33195 <details> <summary>🔧 Fixes</summary> - [[iOS] Shell NavBarIsVisible is not updated when changing ShellContent](#33191) </details> ## Slider - [C] Fix Slider and Stepper property order independence by @StephaneDelcroix in #32939 <details> <summary>🔧 Fixes</summary> - [Slider Binding Initialization Order Causes Incorrect Value Assignment in XAML](#32903) - [Slider is very broken, Value is a mess when setting Minimum](#14472) - [Slider is buggy depending on order of properties](#18910) - [Stepper Value is incorrectly clamped to default min/max when using bindableproperties in MVVM pattern](#12243) - [[Issue-Resolver] Fix #32903 - Sliderbinding initialization order issue](#32907) </details> ## Stepper - [Windows] Maui Stepper: Clamp minimum and maximum value by @OomJan in #33275 <details> <summary>🔧 Fixes</summary> - [[Windows] Maui Stepper is not clamped to minimum or maximum internally](#33274) </details> - [iOS] Fixed the UIStepper Value from being clamped based on old higher MinimumValue - Candidate PR test failure fix- 33363 by @Ahamed-Ali in #33392 ## TabbedPage - [windows] Fixed Rapid change of selected tab results in crash. by @praveenkumarkarunanithi in #33113 <details> <summary>🔧 Fixes</summary> - [Rapid change of selected tab results in crash on Windows.](#32824) </details> ## Titlebar - [Mac] Fix TitleBar Content Overlapping with Traffic Light Buttons on Latest macOS Version by @devanathan-vaithiyanathan in #33157 <details> <summary>🔧 Fixes</summary> - [TitleBar Content Overlapping with Traffic Light Buttons on Latest macOS Version](#33136) </details> ## Xaml - Fix for Control does not update from binding anymore after MultiBinding.ConvertBack is called by @BagavathiPerumal in #33128 <details> <summary>🔧 Fixes</summary> - [Control does not update from binding anymore after MultiBinding.ConvertBack is called](#24969) - [The issue with the MultiBinding converter with two way binding mode does not work properly when changing the values.](#20382) </details> <details> <summary>🔧 Infrastructure (1)</summary> - Avoid KVO on CALayer by introducing an Apple PlatformInterop by @albyrock87 in #30861 </details> <details> <summary>🧪 Testing (2)</summary> - [Testing] Enable UITest Issue18193 on MacCatalyst by @NafeelaNazhir in #31653 <details> <summary>🔧 Fixes</summary> - [Test Issue18193 was disabled on Mac Catalyst](#27206) </details> - Set the CV2 handlers as the default by @Ahamed-Ali in #33177 </details> <details> <summary>📦 Other (3)</summary> - Update WindowsAppSDK to 1.8 by @mattleibow in #32174 <details> <summary>🔧 Fixes</summary> - [Update to WindowsAppSDK](#30858) </details> - Fix command dependency reentrancy by @simonrozsival in #33129 - Fix SafeArea AdjustPan handling and add AdjustNothing mode tests by @PureWeen via @Copilot in #33354 </details> **Full Changelog**: main...inflight/candidate
This reverts commit 5a39604.
Reverts the Windows App SDK update from version 1.7 to 1.8 introduced in PR #32174. ## Reverted Changes **Version downgrades:** - `MicrosoftWindowsAppSDKPackageVersion`: `1.8.251106002` → `1.7.250909003` - `MicrosoftWindowsSDKBuildToolsPackageVersion`: `10.0.26100.4654` → `10.0.22621.756` **Package references removed:** - `Microsoft.WindowsAppSDK` from `Essentials.csproj`, `Graphics.Skia.csproj`, `Graphics.Win2D.csproj` **Restored configurations:** - `Controls.Xaml.csproj`: Re-added `WINDOWS` define constant and `AppxGeneratePriEnabled=false` - `Directory.Build.targets`: Removed `GetTypeScriptCopyToOutputDirectoryItems` target - `WindowsTemplateTest.cs`: Restored original RID-based asset path logic - `windows.cake`: Restored `X509KeyUsageFlags.NonRepudiation` in certificate generation This reverts commit 5a39604. > [!WARNING] > > <details> > <summary>Firewall rules blocked me from connecting to one or more addresses (expand for details)</summary> > > #### I tried to connect to the following addresses, but was blocked by firewall rules: > > - `ghcr.io` > - Triggering command: `/tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph nuget org/repo --local /home/REDACTED/work/maui/maui --branch main --directory src/Controls/src/Xaml --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt` (dns block) > - Triggering command: `/tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph nuget org/repo --local /tmp/dependabot-base-edeX71/repo --branch main --directory src/Essentials/src --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt` (dns block) > - Triggering command: `/tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph nuget org/repo --local /home/REDACTED/work/maui/maui --branch main --directory src/Essentials/src --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt` (dns block) > > If you need me to access, download, or install something from one of these locations, you can either: > > - Configure [Actions setup steps](https://gh.io/copilot/actions-setup-steps) to set up my environment, which run before the firewall is enabled > - Add the appropriate URLs or hosts to the custom allowlist in this repository's [Copilot coding agent settings](https://github.com/dotnet/maui/settings/copilot/coding_agent) (admins only) > > </details> <!-- START COPILOT CODING AGENT SUFFIX --> <!-- START COPILOT ORIGINAL PROMPT --> <details> <summary>Original prompt</summary> > can you revert the following PR ? #32174 </details> <!-- START COPILOT CODING AGENT TIPS --> --- ✨ Let Copilot coding agent [set things up for you](https://github.com/dotnet/maui/issues/new?title=✨+Set+up+Copilot+instructions&body=Configure%20instructions%20for%20this%20repository%20as%20documented%20in%20%5BBest%20practices%20for%20Copilot%20coding%20agent%20in%20your%20repository%5D%28https://gh.io/copilot-coding-agent-tips%29%2E%0A%0A%3COnboard%20this%20repo%3E&assignees=copilot) — coding agent works faster and does higher quality work when set up for your repo. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
This pull request updates several project files to improve Windows platform support and modernize dependencies. The main changes involve updating Windows SDK package versions, adding the `Microsoft.WindowsAppSDK` package to relevant projects, and making adjustments for publishing and output handling. Fixes dotnet#30858 Attempt 1 dotnet#30665 Attempt 2 dotnet#31281 **Dependency updates:** * Updated `MicrosoftWindowsAppSDKPackageVersion` to `1.8.251003001` and `MicrosoftWindowsSDKBuildToolsPackageVersion` to `10.0.26100.4654` in `eng/Versions.props`, ensuring projects use the latest Windows SDKs. **Project file improvements for Windows support:** * Added `Microsoft.WindowsAppSDK` as a `PackageReference` to `Essentials.csproj`, `Graphics.Skia.csproj`, `Graphics.Win2D.csproj`, and duplicated in `Graphics.csproj` to ensure consistent Windows App SDK usage across graphics and essentials projects. [[1]](diffhunk://#diff-f243c2b1e6b28c505c27e07d7cb7a99764386669ce229c6b856c32ca67faaf00R42) [[2]](diffhunk://#diff-f23bffcd581d332998a68c42c65149fa447d2d3bed3d3c0ebf458e279f51e8dfR37) [[3]](diffhunk://#diff-dc41b78aa310aeed937c387045a62fb5f2ae3ce0ce3bb304a7c21782d30c25a6R30) [[4]](diffhunk://#diff-008ec03ba4c24598765341193edb331fec925e36d0f68e4d1bcbbea940790f9dR43) * Removed Windows-specific property settings from `Controls.Xaml.csproj`, simplifying project configuration for Windows builds. **Build and publishing process adjustments:** * Added new MSBuild targets (`GetTypeScriptOutputForPublishing`, `GetTypeScriptCopyToOutputDirectoryItems`) in `Directory.Build.targets` to improve TypeScript output handling during publishing. * Updated asset path logic in `WindowsTemplateTest.cs` to better handle runtime identifier (RID) directories when publishing packaged Windows apps. --------- Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
This pull request updates several project files to improve Windows platform support and modernize dependencies. The main changes involve updating Windows SDK package versions, adding the
Microsoft.WindowsAppSDKpackage to relevant projects, and making adjustments for publishing and output handling.Fixes #30858
Attempt 1 #30665
Attempt 2 #31281
Dependency updates:
MicrosoftWindowsAppSDKPackageVersionto1.8.251003001andMicrosoftWindowsSDKBuildToolsPackageVersionto10.0.26100.4654ineng/Versions.props, ensuring projects use the latest Windows SDKs.Project file improvements for Windows support:
Microsoft.WindowsAppSDKas aPackageReferencetoEssentials.csproj,Graphics.Skia.csproj,Graphics.Win2D.csproj, and duplicated inGraphics.csprojto ensure consistent Windows App SDK usage across graphics and essentials projects. [1] [2] [3] [4]Controls.Xaml.csproj, simplifying project configuration for Windows builds.Build and publishing process adjustments:
GetTypeScriptOutputForPublishing,GetTypeScriptCopyToOutputDirectoryItems) inDirectory.Build.targetsto improve TypeScript output handling during publishing.WindowsTemplateTest.csto better handle runtime identifier (RID) directories when publishing packaged Windows apps.