Skip to content

Ensure we don't override XamlLanguage if it's already set. - #979

Merged
Johan Laanstra (jlaanstra) merged 1 commit into
masterfrom
user/jlaans/fix-condition
Jul 9, 2021
Merged

Ensure we don't override XamlLanguage if it's already set.#979
Johan Laanstra (jlaanstra) merged 1 commit into
masterfrom
user/jlaans/fix-condition

Conversation

@jlaanstra

Copy link
Copy Markdown
Contributor

When NuGet imports the props as part of PackageReference, it easy to end up in situations where the project file defines XamlLanguage before the C++/WinRT props are imported.

We shouldn't override if the value is already set.

@jlaanstra

Johan Laanstra (jlaanstra) commented Jul 9, 2021

Copy link
Copy Markdown
Contributor Author

This is a very straightforward change. I think we can skip the extensive validation of the OS for this. I validated with YourPhone.

@jlaanstra
Johan Laanstra (jlaanstra) merged commit 74240c8 into master Jul 9, 2021
@jlaanstra
Johan Laanstra (jlaanstra) deleted the user/jlaans/fix-condition branch July 9, 2021 17:43
@kennykerr

Copy link
Copy Markdown
Collaborator

While Dale is updating the OS compiler vpack, I don't think he's updating the msbuild vpack. Did you want to do that or is there not really any value?

@jlaanstra

Copy link
Copy Markdown
Contributor Author

Yeah let's do it. Best to be in sync.

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.

2 participants