Support CsWinRT 3.0 multi-targeting and WindowsSdkPackageMinimumRevision #50264
+326
−22
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…iate between CSWinRT 2 and 3
manodasanW
reviewed
Aug 18, 2025
src/Tasks/Microsoft.NET.Build.Tasks/ResolveRuntimePackAssets.cs
Outdated
Show resolved
Hide resolved
manodasanW
reviewed
Aug 19, 2025
src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.props
Outdated
Show resolved
Hide resolved
manodasanW
reviewed
Aug 19, 2025
src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.targets
Outdated
Show resolved
Hide resolved
Sergio0694
reviewed
Aug 19, 2025
Comment on lines
+1320
to
+1333
| <!-- | ||
| Supported Windows versions using CsWinRT 3.0 (.NET 10 is the baseline). This leverages the revision of | ||
| the Windows SDK version to allow multi-targeting, which is required to allow customers to gradually migrate. | ||
| Both CsWinRT 3.0 and 2.x will be supported for a period of time, and packages can target both of them. | ||
| --> | ||
| <WindowsSdkSupportedTargetPlatformVersion Include="10.0.26100.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_26100PackageVersion)" MinimumNETVersion="10.0" /> | ||
| <WindowsSdkSupportedTargetPlatformVersion Include="10.0.22621.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22621PackageVersion)" MinimumNETVersion="10.0" /> | ||
| <WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22000PackageVersion)" MinimumNETVersion="10.0" /> | ||
| <WindowsSdkSupportedTargetPlatformVersion Include="10.0.20348.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_20348PackageVersion)" MinimumNETVersion="10.0" /> | ||
| <WindowsSdkSupportedTargetPlatformVersion Include="10.0.19041.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)" MinimumNETVersion="10.0" /> | ||
| <WindowsSdkSupportedTargetPlatformVersion Include="10.0.18362.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)" MinimumNETVersion="10.0" /> | ||
| <WindowsSdkSupportedTargetPlatformVersion Include="10.0.17763.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)" MinimumNETVersion="10.0" /> | ||
|
|
||
| <!-- Supported Windows versions using CsWinRT 2.x --> |
There was a problem hiding this comment.
We probably need to undo this too, if we're going to use the same package for .NET 9 and 10?
Comment on lines
+1320
to
+1333
| <!-- | ||
| Supported Windows versions using CsWinRT 3.0 (.NET 10 is the baseline). This leverages the revision of | ||
| the Windows SDK version to allow multi-targeting, which is required to allow customers to gradually migrate. | ||
| Both CsWinRT 3.0 and 2.x will be supported for a period of time, and packages can target both of them. | ||
| --> | ||
| <WindowsSdkSupportedTargetPlatformVersion Include="10.0.26100.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_26100PackageVersion)" MinimumNETVersion="10.0" /> | ||
| <WindowsSdkSupportedTargetPlatformVersion Include="10.0.22621.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22621PackageVersion)" MinimumNETVersion="10.0" /> | ||
| <WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22000PackageVersion)" MinimumNETVersion="10.0" /> | ||
| <WindowsSdkSupportedTargetPlatformVersion Include="10.0.20348.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_20348PackageVersion)" MinimumNETVersion="10.0" /> | ||
| <WindowsSdkSupportedTargetPlatformVersion Include="10.0.19041.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)" MinimumNETVersion="10.0" /> | ||
| <WindowsSdkSupportedTargetPlatformVersion Include="10.0.18362.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)" MinimumNETVersion="10.0" /> | ||
| <WindowsSdkSupportedTargetPlatformVersion Include="10.0.17763.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)" MinimumNETVersion="10.0" /> | ||
|
|
||
| <!-- Supported Windows versions using CsWinRT 2.x --> |
There was a problem hiding this comment.
Should we also delete the old items for .NET 5 and 6 below? Since they're out of support now?
| .Should() | ||
| .Pass() | ||
| .And | ||
| .NotHaveStdOutContaining("NETSDK1229"); |
There was a problem hiding this comment.
Mmh isn't this wrong? This test should emit the warning, right? 🤔
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a continuation of #49721
This PR allows multi-targeting CsWinRT 3.0, by leveraging the build number of the target Windows SDK.
That is, e.g.:
net10.0-windows10.0.22621.0---> CsWinRT 2.xnet10.0-windows10.0.22621.1---> CsWinRT 3.0In the implementation, rather than using separate ref packs for CSWinRT 2 and 3, which the previous PR did, this PR uses profiles of the Microsoft.Windows.SDK.NET.Ref framework reference to differentiate between the versions of CSWinRT.
This also adds support for a WindowsSdkPackageMinimumRevision property.