Skip to content

Support CsWinRT 3.0 multi-targeting and WindowsSdkPackageMinimumRevision #50264

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

Draft
wants to merge 23 commits into
base: main
Choose a base branch
from
Draft

Support CsWinRT 3.0 multi-targeting and WindowsSdkPackageMinimumRevision #50264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1fa8f16
Support '1.' TFM for CsWinRT 3.0
Sergio0694 Jul 9, 2025
2ad9302
Add 'UsingPreviewCsWinRT3_0Feature' warning
Sergio0694 Jul 9, 2025
c256006
Add test for new preview warning
Sergio0694 Jul 9, 2025
4821072
Run 'msbuild /t:UpdateXlf'
Sergio0694 Jul 9, 2025
aa2210e
Update 'TargetPlatformVersion' parsing
Sergio0694 Jul 15, 2025
ba90d36
Update targeting pack selection logic
Sergio0694 Jul 15, 2025
a6e227a
Update '_WarnForCsWinRT3_0PreviewFeatureEnabled'
Sergio0694 Jul 15, 2025
4d465e6
Define 'CSWINRT3_0' for CsWinRT 3.0
Sergio0694 Jul 16, 2025
676ece8
Add unit tests
Sergio0694 Jul 16, 2025
0c68835
Revert incorrect 'Strings.resx' change
Sergio0694 Jul 22, 2025
58c260c
Update .xlf files
Sergio0694 Jul 22, 2025
d8d8cb0
Fix parsing normalized SDK version
Sergio0694 Jul 22, 2025
fd4f274
Fix framework references creation for '.1' TFM
Sergio0694 Aug 8, 2025
983f973
Add unit tests for normalized defines
Sergio0694 Aug 14, 2025
0e83d36
Merge branch 'main' into user/sergiopedri/cswinrt3-multi-targeting
dsplaisted Aug 14, 2025
b38c092
Switch to using profiles in the same framework reference to different…
dsplaisted Aug 14, 2025
b622290
Add support for WindowsSdkPackageMinimumRevision
dsplaisted Aug 14, 2025
c29c79e
Fix included profiles
manodasanW Aug 15, 2025
415c772
Add CSWinRT 2 and 3 multi-targeting test
dsplaisted Aug 18, 2025
d7126cc
Don't normalize to .0 TargetPlatformVersion revision for CSWinRT 3
dsplaisted Aug 18, 2025
93d669f
Fix profile names
manodasanW Aug 19, 2025
ca298da
Normalize implicit define
manodasanW Aug 19, 2025
95fdd4b
Fix SupportedOSPlatformVersion and tests
manodasanW Aug 19, 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
15 changes: 14 additions & 1 deletion src/Layout/redist/targets/GenerateBundledVersions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,20 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetingPackVersion="$(NETStandardLibraryRefPackageVersion)"
/>
<!-- Supported Windows versions -->
<!--
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 -->
Comment on lines +1320 to +1333
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably need to undo this too, if we're going to use the same package for .NET 9 and 10?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I put separate items here because these are linked to the TargetPlatformVersion, so we need items both for the .0 and .1 versions. The actual package versions are the same between the corresponding items.

It would be possible to do this differently, but this seemed to be the simplest to me.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, gotcha, yeah makes perfect sense! Thank you for the additional context. Perhaps we could add a line to that comment at line 1321 to also mention this, for future reference? In case anyone else wonders the same I mean.

Comment on lines +1320 to +1333
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also delete the old items for .NET 5 and 6 below? Since they're out of support now?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like in the past I have ran into scenarios where folks like VS were still relying on them as part of their tests. So I wouldn't want to clean it up as part of this change.

<WindowsSdkSupportedTargetPlatformVersion Include="10.0.26100.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_26100PackageVersion)" MinimumNETVersion="8.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.22621.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22621PackageVersion)" MinimumNETVersion="8.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22000PackageVersion)" MinimumNETVersion="8.0" />
Expand Down
6 changes: 5 additions & 1 deletion src/Tasks/Common/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,4 +995,8 @@ You may need to build the project on another operating system or architecture, o
<value>NETSDK1228: This project depends on the Aspire Workload which has been deprecated. Aspire now ships via NuGet packages and no longer requires a workload. Please visit {0} for upgrade guidance.</value>
<comment>{StrBegins="NETSDK1228: "}</comment>
</data>
</root>
<data name="UsingPreviewCsWinRT3_0Feature" xml:space="preserve">
<value>NETSDK1229: Targeting a Windows SDK version with '1' as the revision number will reference CsWinRT 3.0, which is currently in preview. The current project is targeting the Windows SDK version '{0}'. If this is not intended, change the revision number to '0' to use CsWinRT 2.x instead.</value>
<comment>{StrBegins="NETSDK1229: "}</comment>
</data>
</root>
7 changes: 6 additions & 1 deletion src/Tasks/Common/Resources/xlf/Strings.cs.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion src/Tasks/Common/Resources/xlf/Strings.de.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion src/Tasks/Common/Resources/xlf/Strings.es.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion src/Tasks/Common/Resources/xlf/Strings.fr.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion src/Tasks/Common/Resources/xlf/Strings.it.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion src/Tasks/Common/Resources/xlf/Strings.ja.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading