ensure dependencies get packed

saucecontrol · Nov 9, 2023 · 9bf5f9c · 9bf5f9c
1 parent 83b8dd8
commit 9bf5f9c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -10,7 +10,6 @@
 		<BuildOutputTargetFolder>tools</BuildOutputTargetFolder>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 		<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-		<NoWarn>$(NoWarn);NU5128</NoWarn>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -21,12 +20,16 @@
 	</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 -->
 		<PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[7.0.0]" />
 		<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
@@ -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>