From 1c2cd8be504e6e2866659d62c0358d84c22b2ebb Mon Sep 17 00:00:00 2001
From: Riccardo De Agostini <riccardo@tenacom.it>
Date: Tue, 18 Jul 2023 07:42:22 +0200
Subject: [PATCH] Disable NuGetPack module if AlternatePack is being used.

---
 .../Module.Core.PackableProject.targets       | 30 +++++++++++++++++
 .../Modules/NuGetPack/Module.Core.targets     | 32 +++++--------------
 .../Modules/NuGetPack/Module.targets          | 10 +-----
 3 files changed, 39 insertions(+), 33 deletions(-)
 create mode 100644 src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.PackableProject.targets

diff --git a/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.PackableProject.targets b/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.PackableProject.targets
new file mode 100644
index 0000000..3f93bd6
--- /dev/null
+++ b/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.PackableProject.targets
@@ -0,0 +1,30 @@
+<Project>
+
+  <PropertyGroup>
+    <!-- Put packages in artifacts folder. -->
+    <PackageOutputPath>$(ArtifactsDirectory)$(Configuration)\</PackageOutputPath>
+    <!-- Make Owners default to Authors. -->
+    <Owners Condition="'$(Owners)' == ''">$(Authors)</Owners>
+  </PropertyGroup>
+
+  <Import Project="Readme.targets" />
+  <Import Project="License.targets" />
+  <Import Project="ThirdPartyNotices.targets" />
+  <Import Project="PackageIcon.targets" />
+
+  <!-- Coalesce PackageRequireLicenseAcceptance to a boolean value. Default is false. -->
+  <PropertyGroup>
+    <PackageRequireLicenseAcceptance Condition="'$(LicensePackageExpression)' == '' And !$(LicenseFileInPackage)">false</PackageRequireLicenseAcceptance>
+    <PackageRequireLicenseAcceptance Condition="'$(PackageRequireLicenseAcceptance)' != 'true'">false</PackageRequireLicenseAcceptance>
+  </PropertyGroup>
+
+  <!-- Coalesce other properties. -->
+  <PropertyGroup>
+    <DevelopmentDependency Condition="'$(DevelopmentDependency)' != 'true'">false</DevelopmentDependency>
+    <PackageType Condition="'$(PackageType)' == ''">Dependency</PackageType>
+    <Serviceable Condition="'$(Serviceable)' != 'false'">true</Serviceable>
+  </PropertyGroup>
+
+  <Import Project="NuspecFile.targets" />
+
+</Project>
diff --git a/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.targets b/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.targets
index 3f93bd6..9a7d0bc 100644
--- a/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.targets
+++ b/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.targets
@@ -1,30 +1,14 @@
 <Project>
 
-  <PropertyGroup>
-    <!-- Put packages in artifacts folder. -->
-    <PackageOutputPath>$(ArtifactsDirectory)$(Configuration)\</PackageOutputPath>
-    <!-- Make Owners default to Authors. -->
-    <Owners Condition="'$(Owners)' == ''">$(Authors)</Owners>
+  <!-- IsPackable default = true for libraries, otherwise false. -->
+  <PropertyGroup Condition="'$(IsPackable)' == ''">
+    <IsPackable Condition="'$(BV_IsLibraryProject)' == 'true'">true</IsPackable>
   </PropertyGroup>
-
-  <Import Project="Readme.targets" />
-  <Import Project="License.targets" />
-  <Import Project="ThirdPartyNotices.targets" />
-  <Import Project="PackageIcon.targets" />
-
-  <!-- Coalesce PackageRequireLicenseAcceptance to a boolean value. Default is false. -->
-  <PropertyGroup>
-    <PackageRequireLicenseAcceptance Condition="'$(LicensePackageExpression)' == '' And !$(LicenseFileInPackage)">false</PackageRequireLicenseAcceptance>
-    <PackageRequireLicenseAcceptance Condition="'$(PackageRequireLicenseAcceptance)' != 'true'">false</PackageRequireLicenseAcceptance>
+  <PropertyGroup Condition="'$(IsPackable)' != 'true'">
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
-
-  <!-- Coalesce other properties. -->
-  <PropertyGroup>
-    <DevelopmentDependency Condition="'$(DevelopmentDependency)' != 'true'">false</DevelopmentDependency>
-    <PackageType Condition="'$(PackageType)' == ''">Dependency</PackageType>
-    <Serviceable Condition="'$(Serviceable)' != 'false'">true</Serviceable>
-  </PropertyGroup>
-
-  <Import Project="NuspecFile.targets" />
+  
+  <Import Project="$(MSBuildThisFileDirectory)Module.Core.PackableProject.targets"
+          Condition="$(IsPackable)" />
 
 </Project>
diff --git a/src/Buildvana.Sdk/Modules/NuGetPack/Module.targets b/src/Buildvana.Sdk/Modules/NuGetPack/Module.targets
index c278a9d..4db8385 100644
--- a/src/Buildvana.Sdk/Modules/NuGetPack/Module.targets
+++ b/src/Buildvana.Sdk/Modules/NuGetPack/Module.targets
@@ -1,14 +1,6 @@
 <Project>
-
-  <!-- IsPackable default = true for libraries, otherwise false. -->
-  <PropertyGroup Condition="'$(IsPackable)' == ''">
-    <IsPackable Condition="'$(BV_IsLibraryProject)' == 'true'">true</IsPackable>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(IsPackable)' != 'true'">
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
   
   <Import Project="$(MSBuildThisFileDirectory)Module.Core.targets"
-          Condition="$(IsPackable)" />
+          Condition="!$(UsingAlternatePack)" />
 
 </Project>