Try harder to default PackageId when IsPackable=true

i.e. for cases where the SDK hasn't defaulted yet the AssemblyName even, the SDK targets use the MSBuildProjectName too as a fallback. So we do the same too.
devlooped · Oct 8, 2020 · c19f327 · c19f327
1 parent b73c6ca
commit c19f327
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/NuGetizer.Tasks/NuGetizer.PackageMetadata.targets b/src/NuGetizer.Tasks/NuGetizer.PackageMetadata.targets
@@ -13,7 +13,8 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <PropertyGroup Label="Hidden">
     <!-- Matches the SDK Pack default when set to true. -->
-    <PackageId Condition="'$(IsPackable)' == 'true' and '$(PackageId)' == ''">$(AssemblyName)</PackageId>    
+    <PackageId Condition="'$(IsPackable)' == 'true' and '$(PackageId)' == ''">$(AssemblyName)</PackageId>
+    <PackageId Condition="'$(IsPackable)' == 'true' and '$(PackageId)' == ''">$(MSBuildProjectName)</PackageId>
   </PropertyGroup>
 
   <ItemDefinitionGroup>

diff --git a/src/NuGetizer.Tasks/NuGetizer.Shared.targets b/src/NuGetizer.Tasks/NuGetizer.Shared.targets
@@ -39,6 +39,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup Label="Hidden">
     <!-- Matches the SDK Pack default when set to true. -->
     <PackageId Condition="'$(IsPackable)' == 'true' and '$(PackageId)' == ''">$(AssemblyName)</PackageId>
+    <PackageId Condition="'$(IsPackable)' == 'true' and '$(PackageId)' == ''">$(MSBuildProjectName)</PackageId>
 
     <IsPackable Condition="'$(IsPackable)' == '' and '$(PackageId)' != ''">true</IsPackable>
     <IsPackable Condition="'$(IsPackable)' == '' and '$(PackageId)' == ''">false</IsPackable>