Skip to content

Remove use of umbrella libraries #520

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.

Sign up for GitHub

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

Merged
kennykerr merged 4 commits into from
Feb 5, 2020
Merged

Remove use of umbrella libraries #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36e60e9
Remove use of WindowsApp.lib
wjk Feb 5, 2020
02782e0
Update property description in property page schema
wjk Feb 5, 2020
e093b8f
Merge branch 'master' into remove-umbrella-libs
kennykerr Feb 5, 2020
046437b
Remove inconsistent usage of periods in Description elements
wjk Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions nuget/CppWinrtRules.Project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<StringProperty Name="RootNamespace"
DisplayName="Root Namespace"
Description="Specifies the default namespace to be used with new files created in this project."
Description="Specifies the default namespace to be used with new files created in this project"
Category="General" />

<EnumProperty Name="CppWinRTVerbosity"
Expand All @@ -25,15 +25,15 @@

<EnumProperty Name="CppWinRTProjectLanguage"
DisplayName="Project Language"
Description="Sets the C++ dialect for the project. C++/WinRT provides full projection support, C++/CX permits consuming projection headers."
Description="Sets the C++ dialect for the project. C++/WinRT provides full projection support, C++/CX permits consuming projection headers"
Category="General">
<EnumValue Name="C++/WinRT" DisplayName="C++/WinRT" Description="Enables full consuming and producing projection support and Xaml integration" />
<EnumValue Name="C++/CX" DisplayName="C++/CX" Description="Enables C++/CX code to generate and use consuming projections" />
</EnumProperty>

<BoolProperty Name="CppWinRTLibs"
DisplayName="Umbrella Library"
Description="Adds the WindowsApp.lib umbrella library for Windows Runtime imports"
Description="Adds import libraries required for Windows Runtime support"
Category="General" />

<BoolProperty Name="CppWinRTModernIDL"
Expand Down
2 changes: 1 addition & 1 deletion nuget/Microsoft.Windows.CppWinRT.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<TypeLibraryName Condition="'%(Midl.TypeLibraryName)'==''"></TypeLibraryName>
</Midl>
<Link>
<AdditionalDependencies Condition="'$(CppWinRTLibs)' != 'false'">WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(CppWinRTLibs)' != 'false'">ole32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>

Expand Down