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.

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

Properties moved to UseMauiCore need to work in the repo #6844

Merged
merged 1 commit into from
May 5, 2022

Conversation

mattleibow
Copy link
Member

Description of Change

As part of #6767, I did not restart VS enough times so some changes did not apply in the IDE.

This PR makes sure the repo has access to the properties in the new file by including it in the InTree props/targets

Issues Fixed

Related to #6767

As part of #6767, I did not restart VS enough times so some changes did not apply in the IDE.
@@ -0,0 +1,10 @@
<Project>

<PropertyGroup Condition=" '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'windows' ">
Copy link
Member Author

Choose a reason for hiding this comment

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

Moved the properties into this props file so that it can be shared by the workloads and the repo.

@@ -1,4 +1,5 @@
<Project>
<Import Project="$(_MauiBuildTasksLocation)AutoImport.InTree.props"/>
<Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Core.props"/>
Copy link
Member Author

Choose a reason for hiding this comment

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

Make sure to include the props in the repo/samples.

@@ -0,0 +1,3 @@
<Project>
Copy link
Member Author

Choose a reason for hiding this comment

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

This targets file is just for completeness - and less effort later on.

<GenerateLibraryLayout Condition=" '$(GenerateLibraryLayout)' == '' and '$(EnableMsixTooling)' == 'true' and '$(OutputType)' != 'Exe' and '$(OutputType)' != 'WinExe' ">true</GenerateLibraryLayout>
<WinUISDKReferences Condition=" '$(WinUISDKReferences)' == '' and '$(EnableMsixTooling)' == 'true' ">false</WinUISDKReferences>
</PropertyGroup>
<Import Project="Microsoft.Maui.Core.props" />
Copy link
Member Author

Choose a reason for hiding this comment

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

Include the shared props file and not the actual setters.

@mattleibow mattleibow changed the title Properties moved to UseMauiCore work in the repo Properties moved to UseMauiCore need to work in the repo May 5, 2022
@mattleibow
Copy link
Member Author

Confirmed still working in the maui release by copying over the targets and running some apps as well as building class libraries / apps with dotnet build.

@mattleibow mattleibow merged commit b5bf49f into main May 5, 2022
@mattleibow mattleibow deleted the dev/fix-winui-intree branch May 5, 2022 08:54
@github-actions github-actions bot locked and limited conversation to collaborators Dec 22, 2023
@samhouts samhouts added the fixed-in-6.0.312 Look for this fix in 6.0.312! label Aug 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
fixed-in-6.0.312 Look for this fix in 6.0.312!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants