Merge branch 'master' into user/jlaans/391

microsoft · Oct 22, 2019 · bd01bc4 · bd01bc4
2 parents c8d27c1 + cbe9659
commit bd01bc4
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 106 deletions.
diff --git a/nuget/Microsoft.Windows.CppWinRT.props b/nuget/Microsoft.Windows.CppWinRT.props
@@ -17,13 +17,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         <WinMDAssembly>true</WinMDAssembly>
     </PropertyGroup>
 
-    <!-- For a static library we don't want the winmd/lib/pdb to be packaged -->
-    <PropertyGroup Condition="'$(ConfigurationType)' == 'StaticLibrary'">
-        <IncludeCopyWinMDArtifactsOutputGroup>false</IncludeCopyWinMDArtifactsOutputGroup>
-        <IncludeBuiltProjectOutputGroup>false</IncludeBuiltProjectOutputGroup>
-        <IncludeDebugSymbolsProjectOutputGroup>false</IncludeDebugSymbolsProjectOutputGroup>
-    </PropertyGroup>
-
     <ItemDefinitionGroup>
         <ClCompile>
             <CompileAsWinRT Condition="'$(CppWinRTProjectLanguage)' != 'C++/CX' And '%(ClCompile.CompileAsWinRT)' == ''">false</CompileAsWinRT>