Skip to content
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

Enable Windows.UI.Xaml profile for Windows SDK projections #41936

Merged
merged 40 commits into from
Aug 27, 2024
Merged

Enable Windows.UI.Xaml profile for Windows SDK projections #41936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
4312915
Update Windows SDK projection package
manodasanW Aug 8, 2024
2b0935d
Fix a typo in an XML comment
Sergio0694 Jul 2, 2024
e7d713b
Enable profiles in 'CreateKnownFrameworkReferences'
Sergio0694 Jul 2, 2024
ec0ad19
Update 'Microsoft.NET.Windows.targets'
Sergio0694 Jul 2, 2024
06a3844
Make 'UseUwp' and 'UseWinUI' compiler visible
Sergio0694 Jul 2, 2024
57cb6c9
Configure WUX feature switch and properties
Sergio0694 Jul 2, 2024
91c9a32
Reference previous framework package when <= 9.0
Sergio0694 Jul 2, 2024
f7fb5f4
Produce error when 'UseUwp' is missing
Sergio0694 Jul 2, 2024
2745987
Remove 'UseUwp' and 'UseWinUI' as compiler visible
Sergio0694 Jul 2, 2024
9d0747b
Emit a warning when 'UseUwp' is set
Sergio0694 Jul 3, 2024
6283c97
Fix 'UseUwp' warning message id
Sergio0694 Jul 15, 2024
d3b32f3
Add unit tests for new errors/warnings
Sergio0694 Jul 15, 2024
8fd580e
Add unit tests to verify assembly references
Sergio0694 Jul 15, 2024
4cd4a3d
Always specify a profile for all TFMs
Sergio0694 Jul 15, 2024
38a72cf
Add error when using 'UseUwp' with invalid TFM
Sergio0694 Jul 15, 2024
4fd7a4f
Skip WUX feature switch on unsupported TFMs
Sergio0694 Jul 15, 2024
24084da
Restructure profiles following review comment
Sergio0694 Jul 17, 2024
e431332
Apply changes to use new split subset profiles
Sergio0694 Jul 29, 2024
26fb833
Update .xlf files
Sergio0694 Jul 29, 2024
f079ef8
Fix error ids in new unit tests
Sergio0694 Jul 31, 2024
456ffbd
Add unit test for 'NETSDK1219' error
Sergio0694 Jul 31, 2024
5cca576
Fix mismatched .resw resource name
Sergio0694 Jul 31, 2024
eb2c4db
Update .xlf files
Sergio0694 Aug 8, 2024
8ed163a
Emit 'WindowsSDKXamlInvalidTfm' for .NET < 8
Sergio0694 Aug 8, 2024
48ae26d
Don't reference Xaml profile for .NET < 8
Sergio0694 Aug 8, 2024
fe81177
Update error/warning ids in unit tests
Sergio0694 Aug 8, 2024
4078228
Don't set the feature switch for .NET < 8
Sergio0694 Aug 9, 2024
c1d409c
Remove trailing blank line
Sergio0694 Aug 9, 2024
2db7488
Set new Windows SDK package in unit tests
Sergio0694 Aug 9, 2024
88f7a26
Fix .dll-s not being copied to output folder
Sergio0694 Aug 11, 2024
e66c1b1
Fix conflict check
manodasanW Aug 11, 2024
cc866cc
Fix package version in SDK conflict unit test
Sergio0694 Aug 12, 2024
6647bff
Skip test needing updated projections to build
Sergio0694 Aug 12, 2024
7a108bb
Fix comment
Sergio0694 Aug 12, 2024
f78790c
Undo removing ".Windows" known reference
Sergio0694 Aug 20, 2024
d47b237
Use 'TargetFrameworkVersion' for .NET check
Sergio0694 Aug 20, 2024
4391f6a
Improve condition for including ".Xaml" profile
Sergio0694 Aug 20, 2024
86bd92e
Improve condition for WUX feature switch
Sergio0694 Aug 20, 2024
4763b7c
Improve condition for "net8.0-windows" check
Sergio0694 Aug 20, 2024
6c72933
Update comments for Windows SDK special casing
Sergio0694 Aug 22, 2024
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
21 changes: 14 additions & 7 deletions eng/ManualVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,20 @@
Basically: In this file, choose the highest version when resolving merge conflicts.
-->
<PropertyGroup>
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.34</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.34</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.34</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.34</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.34</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.34</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.34</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.39</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.39</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.39</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.39</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.39</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.39</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.39</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.38</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.38</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.38</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.38</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.38</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.38</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.38</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
</PropertyGroup>

</Project>
22 changes: 15 additions & 7 deletions src/Installer/redist-installer/targets/GenerateBundledVersions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,13 +1177,21 @@ Copyright (c) .NET Foundation. All rights reserved.
/>

<!-- Supported Windows versions -->
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.26100.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_26100PackageVersion)" MinimumNETVersion="6.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.22621.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22621PackageVersion)" MinimumNETVersion="6.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22000PackageVersion)" MinimumNETVersion="6.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.20348.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_20348PackageVersion)" MinimumNETVersion="6.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.19041.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)" MinimumNETVersion="6.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.18362.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)" MinimumNETVersion="6.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.17763.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)" MinimumNETVersion="6.0" />
<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" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.20348.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_20348PackageVersion)" MinimumNETVersion="8.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.19041.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)" MinimumNETVersion="8.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.18362.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)" MinimumNETVersion="8.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.17763.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)" MinimumNETVersion="8.0" />

<WindowsSdkSupportedTargetPlatformVersion Include="10.0.26100.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6)" MinimumNETVersion="6.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.22621.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6)" MinimumNETVersion="6.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6)" MinimumNETVersion="6.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.20348.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6)" MinimumNETVersion="6.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.19041.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6)" MinimumNETVersion="6.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.18362.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6)" MinimumNETVersion="6.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.17763.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6)" MinimumNETVersion="6.0" />

<WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.0" WindowsSdkPackageVersion="10.0.22000.26" MinimumNETVersion="5.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.20348.0" WindowsSdkPackageVersion="10.0.20348.26" MinimumNETVersion="5.0" />
Expand Down
14 changes: 13 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 @@ -960,5 +960,17 @@ You may need to build the project on another operating system or architecture, o
<value>NETSDK1217: Invalid value in AppHostDotNetSearch: '{0}'.</value>
<comment>{StrBegin="NETSDK1217: "}</comment>
</data>
<!-- The latest message added is InvalidAppHostDotNetSearch. Please update this value with each PR to catch parallel PRs both adding a new message -->
<data name="WindowsSDKXamlMissingUseUwpProperty" xml:space="preserve">
<value>NETSDK1218: This project has a transitive dependency on the full Windows SDK projections (including Windows.UI.Xaml.* types), but does not specify the UseUwp property. That must be enabled to ensure that .NET types are projected and marshalled correctly for interop scenarios with these XAML types.</value>
<comment>{StrBegin="NETSDK1218: "}</comment>
</data>
<data name="UsingPreviewUseUwpFeature" xml:space="preserve">
<value>NETSDK1219: UseUwp and all associated functionality are currently experimental and not officially supported.</value>
<comment>{StrBegin="NETSDK1219: "}</comment>
</data>
<data name="WindowsSDKXamlInvalidTfm" xml:space="preserve">
<value>NETSDK1220: UseUwp and all associated functionality require using a TFM of 'net8.0-windows' or greater.</value>
<comment>{StrBegin="NETSDK1220: "}</comment>
</data>
<!-- The latest message added is WindowsSDKXamlInvalidTfm. Please update this value with each PR to catch parallel PRs both adding a new message -->
</root>
15 changes: 15 additions & 0 deletions 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.

15 changes: 15 additions & 0 deletions 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.

15 changes: 15 additions & 0 deletions 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.

Loading