From 9bf5f9cba307ab4a737e5b0f563a86bf13958fb1 Mon Sep 17 00:00:00 2001
From: Clinton Ingram <clinton.ingram@outlook.com>
Date: Mon, 6 Nov 2023 23:00:42 -0800
Subject: [PATCH] ensure dependencies get packed

---
 azure-pipelines.yml                                        | 5 ++++-
 src/InheritDoc/InheritDoc.csproj                           | 7 +++++--
 src/InheritDoc/package/build/SauceControl.InheritDoc.props | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 90570f3..cc5394e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -28,9 +28,12 @@ steps:
     version: 6.0.x
     performMultiLevelLookup: true
 
-- script: dotnet build src/InheritDoc -c Dist --version-suffix ci$(Build.BuildNumber)
+- script: dotnet build src/InheritDoc -c Dist -p:GeneratePackageOnBuild=false
   displayName: Build
 
+- script: dotnet build src/InheritDoc -c Dist --version-suffix ci$(Build.BuildNumber)
+  displayName: Pack
+
 - script: dotnet test tests/InheritDoc.Test -c Coverage
   displayName: Test
 
diff --git a/src/InheritDoc/InheritDoc.csproj b/src/InheritDoc/InheritDoc.csproj
index c8d83e0..e271c5b 100644
--- a/src/InheritDoc/InheritDoc.csproj
+++ b/src/InheritDoc/InheritDoc.csproj
@@ -10,7 +10,6 @@
 		<BuildOutputTargetFolder>tools</BuildOutputTargetFolder>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 		<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-		<NoWarn>$(NoWarn);NU5128</NoWarn>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -21,7 +20,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" />
 		<PackageReference Include="Mono.Cecil" Version="0.11.5" PrivateAssets="all" />
 		<PackageReference Condition="$(DefineConstants.Contains('NETFRAMEWORK'))" Include="System.ValueTuple" Version="4.5.0" />
 		<!-- these are for use in the test project, downloaded here to avoid version conflicts when building tests -->
@@ -29,4 +28,8 @@
 		<PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net48" Version="[1.0.0]" />
 	</ItemGroup>
 
+	<Target Name="VerifyPackDependencies" BeforeTargets="GenerateNuspec">
+		<Error Condition="@(None->WithMetadataValue('Pack', 'true')->WithMetadataValue('Filename', 'Mono.Cecil')->Count()) != 2" Text="Dependencies were not present for pack. Start build again." />
+	</Target>
+
 </Project>
diff --git a/src/InheritDoc/package/build/SauceControl.InheritDoc.props b/src/InheritDoc/package/build/SauceControl.InheritDoc.props
index 5c47919..ecc3987 100644
--- a/src/InheritDoc/package/build/SauceControl.InheritDoc.props
+++ b/src/InheritDoc/package/build/SauceControl.InheritDoc.props
@@ -2,7 +2,7 @@
 <Project>
 
 	<PropertyGroup>
-		<_InheritDocTaskTfm Condition="'$(MSBuildRuntimeType)'!='Core'">net46</_InheritDocTaskTfm>
+		<_InheritDocTaskTfm Condition="'$(MSBuildRuntimeType)'!='Core'">net462</_InheritDocTaskTfm>
 		<_InheritDocTaskTfm Condition="'$(MSBuildRuntimeType)'=='Core'">netstandard2.0</_InheritDocTaskTfm>
 		<_InheritDocTaskLib>$(MSBuildThisFileDirectory)..\tools\$(_InheritDocTaskTfm)\SauceControl.InheritDoc.dll</_InheritDocTaskLib>
 		<_InheritDocNetStandardFallback>$(MSBuildThisFileDirectory)..\tools\netstandard.xml.gz</_InheritDocNetStandardFallback>