Move some of the require props into Core and fix #6529 #6767
Conversation
mattleibow
changed the title
| As a result, if you have a net6.0 class library, the app will call MSBuild on that library - with the Windows TFM! | ||
| This results in the $(TargetPlatformIdentifier) condition being met - even though there are no WASK targets to run! | ||
| --> | ||
| <Import Project="WinUI.targets" Condition=" '$(TargetPlatformIdentifier)' == 'windows' and '$(WindowsAppSDKWinUI)' == 'true'" /> |
There was a problem hiding this comment.
Make sure that when this target is imported it is BOTH a windows project AND it is referencing the WASDK nuget. If MSBuild is run with a TargetFramework of windows, the first condition will become true, but the second one will not because the real project will not have referenced the WASDK nuget.
And this is fine because all the targets in the WinUI.targets are workarounds for windows AND WASDK nuget together.
| <PropertyGroup Condition=" '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'windows' "> | ||
| <EnableMsixTooling Condition=" '$(EnableMsixTooling)' == '' ">true</EnableMsixTooling> | ||
| <EnablePreviewMsixTooling Condition=" '$(EnablePreviewMsixTooling)' == '' ">$(EnableMsixTooling)</EnablePreviewMsixTooling> | ||
| <GenerateLibraryLayout Condition=" '$(GenerateLibraryLayout)' == '' and '$(EnableMsixTooling)' == 'true' and '$(OutputType)' != 'Exe' and '$(OutputType)' != 'WinExe' ">true</GenerateLibraryLayout> | ||
| <WinUISDKReferences Condition=" '$(WinUISDKReferences)' == '' and '$(EnableMsixTooling)' == 'true' ">false</WinUISDKReferences> | ||
| </PropertyGroup> |
There was a problem hiding this comment.
Moved these properties to here to reduce the required properties in class libraries that use maui but do not set single project and target windows:
- we mainly require
EnableMsixToolingfor dotnet build, but it also fixes some bugs GenerateLibraryLayoutis required for all libraries... not sure why it is not setWinUISDKReferencesis a compatibility feature and should be avoided in new projects
mattleibow
added
area-single-project
| <WindowsPackageType Condition=" '$(WindowsPackageType)' == '' and '$(EnableMsixTooling)' == 'true' and ('$(OutputType)' == 'Exe' or '$(OutputType)' == 'WinExe') ">MSIX</WindowsPackageType> | ||
| <WinUISDKReferences Condition=" '$(WinUISDKReferences)' == '' and '$(EnableMsixTooling)' == 'true' and ('$(OutputType)' == 'Exe' or '$(OutputType)' == 'WinExe') ">false</WinUISDKReferences> | ||
| <GenerateLibraryLayout Condition=" '$(GenerateLibraryLayout)' == '' and '$(EnableMsixTooling)' == 'true' and '$(OutputType)' != 'Exe' and '$(OutputType)' != 'WinExe' ">true</GenerateLibraryLayout> | ||
| <WindowsAppSdkBootstrapInitialize Condition=" '$(WindowsAppSdkBootstrapInitialize)' == '' and '$(EnableMsixTooling)' == 'true' and '$(OutputType)' != 'Exe' and '$(OutputType)' != 'WinExe' ">false</WindowsAppSdkBootstrapInitialize> |
There was a problem hiding this comment.
This might also need to be moved as a result of microsoft/WindowsAppSDK#2456 - along with WindowsPackageType
Redth
added
p/1
As part of #6767, I did not restart VS enough times so some changes did not apply in the IDE.
As part of #6767, I did not restart VS enough times so some changes did not apply in the IDE.
|
The rd.3 release tag is set 12 days ago: So perhaps the conclusion is that the fix is just not part of the release. What was confusing for my is that the actual release of rc.3 is 5 days ago. I assumed it was released from master on that same day but apparently it was released 7 days before. Not sure what happens in those 7 days. |
Description of Change
Previously we just assumed that when the project was a maui project (that always brings in WASDK) and the TFM is windows (always the WASDK) that we can use things. However, the app will lie to us and ALWAYS tell us we are a windows library - even if we are net6.0.
This PR fixes some things, but mainly makes sure that when it is importing the WinUI workarounds it is also referencing WASDK. So, when the app lies to us, we can see the truth!
Issues Fixed
Fixes #6529