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

Switch from wux to mux where possible #157

Merged
merged 3 commits into from
Apr 20, 2020
Merged

Switch from wux to mux where possible #157

merged 3 commits into from
Apr 20, 2020

Conversation

Scottj1s
Copy link
Member

fixes #147

@Scottj1s
Copy link
Member Author

@stevenbrix - this requires a fix to the WinUI nuget for native clients:
the build\native\Microsoft.WinUI.targets tries to import non-existent targets files

@manodasanW - need confirmation on what's in "WUX" (but outside that namespace) and thus needs to be mapped to MUX - e.g., Windows.UI.Color

@@ -21,6 +21,14 @@
</Target>

<Target Name="GenerateProjection" BeforeTargets="DispatchToInnerBuilds;Build" Condition="'$(GenerateTestProjection)' == 'true'">
<PropertyGroup>
<!--PkgMicrosoft_WinUI is set in in obj\*.csproj.nuget.g.props with TargetFramework condition, doesn't support multi-targeting-->
<PkgMicrosoft_WinUI Condition="'$(PkgMicrosoft_WinUI)'==''">$(NuGetPackageFolders)microsoft.winui\$(MicrosoftWinUIVersion)</PkgMicrosoft_WinUI>
Copy link
Member Author

Choose a reason for hiding this comment

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

@stevenbrix - not sure whether this is a bug in WinUI or not

@Scottj1s Scottj1s changed the title [NO MERGE] switch from wux to mux where possible Switch from wux to mux where possible Apr 20, 2020
@Scottj1s
Copy link
Member Author

Scottj1s commented Apr 20, 2020

WinUIProjection.cs has a few workarounds for WinUI nuget issues. These can be removed when the WinUI nuget is free of Windows.UI.Xaml and Windows.UI.Text references.

To work around the native targets file issue (importing missing Microsoft.UI.targets and Microsoft.UI.Composition.targets), I just updated to a newer version of the Nuget.

@stevenbrix
Copy link
Contributor

WinUIProjection.cs has a few workarounds for WinUI nuget issues. These can be removed when the WinUI nuget is free of Windows.UI.Xaml and Windows.UI.Text references.

I'm not expecting this particular issue to go way until after Preview1, is that ok?

this requires a fix to the WinUI nuget for native clients:
the build\native\Microsoft.WinUI.targets tries to import non-existent targets files

can you update to version 3.0.0-preview1.200419.0-CI and let me know if you still see issues?

@stevenbrix
Copy link
Contributor

As part of moving to that Nuget, you should also be able to remove <DisableEmbeddedXbf>true</DisableEmbeddedXbf> from WinUIDesktopSample.csproj

@Scottj1s
Copy link
Member Author

WinUIProjection.cs has a few workarounds for WinUI nuget issues. These can be removed when the WinUI nuget is free of Windows.UI.Xaml and Windows.UI.Text references.

I'm not expecting this particular issue to go way until after Preview1, is that ok?

this requires a fix to the WinUI nuget for native clients:
the build\native\Microsoft.WinUI.targets tries to import non-existent targets files

can you update to version 3.0.0-preview1.200419.0-CI and let me know if you still see issues?

Instead of 3.0.0-preview1.200420.0-CI (which is what I've done)?

@Scottj1s
Copy link
Member Author

Scottj1s commented Apr 20, 2020

As part of moving to that Nuget, you should also be able to remove <DisableEmbeddedXbf>true</DisableEmbeddedXbf> from WinUIDesktopSample.csproj

Are you asking to move to 3.0.0-preview1.200419.0-CI across the board (managed and native projects)?

OK, that seems to satisfy all projects - done

@Scottj1s Scottj1s merged commit f312cf5 into master Apr 20, 2020
@Scottj1s Scottj1s deleted the scottj1s/mux_switch branch April 20, 2020 20:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Modify Xaml type mappings to MUX instead of WUX
2 participants