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

fix: Re-work resource names to avoid issues with xaml merge #197

Merged
merged 1 commit into from
Mar 8, 2022

Conversation

kazo0
Copy link
Contributor

@kazo0 kazo0 commented Mar 7, 2022

closes unoplatform/uno#8224
closes unoplatform/uno#8230
closes unoplatform/uno#8228
closes unoplatform/uno#8224

PR Type

What kind of change does this PR introduce?

  • Bugfix

Prior to introducing the xaml merge task, each Resource Dict in Toolkit.Material and Toolkit.Cupertino were re-defining certiain static resources using the same key but in different file. Now with the xaml merge, we need to use more specific resource keys for each control

@jeromelaban
Copy link
Member

jeromelaban commented Mar 7, 2022

It feels like we should also be changing the xaml merge tool to detect these overrides, as it hides issues.

@kazo0 kazo0 enabled auto-merge (squash) March 8, 2022 18:06
@jeromelaban jeromelaban closed this Mar 8, 2022
auto-merge was automatically disabled March 8, 2022 18:08

Pull request was closed

@jeromelaban jeromelaban reopened this Mar 8, 2022
@github-actions
Copy link

github-actions bot commented Mar 8, 2022

Azure Static Web Apps: Your stage site is ready! Visit it here: https://polite-field-01aa64f0f-197.eastus2.azurestaticapps.net

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment