Revert "Remove use of umbrella libraries (#520)" (#529)

microsoft · Feb 14, 2020 · 13cd55c · 13cd55c
1 parent 61c8fed
commit 13cd55c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/nuget/CppWinrtRules.Project.xml b/nuget/CppWinrtRules.Project.xml
@@ -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"
@@ -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 import libraries required for Windows Runtime support"
+                Description="Adds the WindowsApp.lib umbrella library for Windows Runtime imports"
                 Category="General" />
 
   <BoolProperty Name="CppWinRTModernIDL"

diff --git a/nuget/Microsoft.Windows.CppWinRT.props b/nuget/Microsoft.Windows.CppWinRT.props
@@ -47,7 +47,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
             <TypeLibraryName Condition="'%(Midl.TypeLibraryName)'==''"></TypeLibraryName>
         </Midl>
         <Link>
-            <AdditionalDependencies Condition="'$(CppWinRTLibs)' != 'false'">ole32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+            <AdditionalDependencies Condition="'$(CppWinRTLibs)' != 'false'">WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
         </Link>
     </ItemDefinitionGroup>