Skip to content

Commit 74240c8

Browse files
authored
Ensure we don't override XamlLanguage if it's already set. (#979)
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.
1 parent 54c1097 commit 74240c8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

nuget/Microsoft.Windows.CppWinRT.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
1717
<CanReferenceWinRT>true</CanReferenceWinRT>
1818
<CppWinRTPackage Condition="'$(CppWinRTEnabled)' != 'true'">true</CppWinRTPackage>
1919
<CppWinRTPackage Condition="'$(CppWinRTPackage)' != 'true'">false</CppWinRTPackage>
20-
<XamlLanguage>CppWinRT</XamlLanguage>
20+
<XamlLanguage Condition="'$(XamlLanguage)' == ''">CppWinRT</XamlLanguage>
2121
<IsNativeLanguage>true</IsNativeLanguage>
2222
<!-- This causes VS to add the platform WinMD references for the target SDK -->
2323
<WinMDAssembly>true</WinMDAssembly>

0 commit comments

Comments
 (0)