Enable msbuild /t:pack on library packages

Progress on NuGet/Engineering#1673
NuGet · Oct 24, 2018 · 7d6bca5 · 7d6bca5
1 parent 79c8107
commit 7d6bca5
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 149 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -147,13 +147,17 @@ Invoke-BuildStep 'Creating artifacts' {
         # We need a few projects to be published for sharing the common bits with other repos.
         # We need symbols published for those, too. All other packages are deployment ones and
         # don't need to be shared, hence no need for symbols for them
-        $ProjectsWithSymbols =
+        $CsprojProjects =
             "src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj",
             "src/Validation.Common.Job/Validation.Common.Job.csproj",
             "src/Validation.ScanAndSign.Core/Validation.ScanAndSign.Core.csproj",
             "src/Validation.Symbols.Core/Validation.Symbols.Core.csproj"
 
-        $Projects = `
+        $CsprojProjects | ForEach-Object {
+            New-ProjectPackage (Join-Path $PSScriptRoot $_) -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -Symbols
+        }
+
+        $NuspecProjects = `
             "src/Stats.CollectAzureCdnLogs/Stats.CollectAzureCdnLogs.csproj", `
             "src/Stats.AggregateCdnDownloadsInGallery/Stats.AggregateCdnDownloadsInGallery.csproj", `
             "src/Stats.ImportAzureCdnStatistics/Stats.ImportAzureCdnStatistics.csproj", `
@@ -181,12 +185,10 @@ Invoke-BuildStep 'Creating artifacts' {
             "src/Monitoring.RebootSearchInstance/Monitoring.RebootSearchInstance.csproj", `
             "src/StatusAggregator/StatusAggregator.csproj", `
             "src/Validation.Symbols.Core/Validation.Symbols.Core.csproj", `
-            "src/Validation.Symbols/Validation.Symbols.csproj" `
-            + $ProjectsWithSymbols
+            "src/Validation.Symbols/Validation.Symbols.csproj"
 
-        Foreach ($Project in $Projects) {
-            $Symbols = $ProjectsWithSymbols -contains $Project;
-            New-Package (Join-Path $PSScriptRoot "$Project") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "$msBuildVersion" -Symbols:$Symbols
+        Foreach ($Project in $NuspecProjects) {
+            New-Package (Join-Path $PSScriptRoot "$Project") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "$msBuildVersion"
         }
     } `
     -ev +BuildErrors

diff --git a/src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj b/src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj
@@ -15,6 +15,10 @@
     <DefineConstants>TRACE</DefineConstants>
     <TargetFrameworkProfile />
   </PropertyGroup>
+  <PropertyGroup>
+    <Authors>.NET Foundation</Authors>
+    <IncludeSymbols Condition="'$(IncludeSymbols)' == ''">true</IncludeSymbols>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -90,6 +94,11 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions">
       <Version>1.1.2</Version>
     </PackageReference>
+    <PackageReference Include="NuGet.Build.Tasks.Pack">
+      <Version>4.8.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="NuGet.Services.Configuration">
       <Version>2.27.0</Version>
     </PackageReference>

diff --git a/src/Validation.Common.Job/Validation.Common.Job.csproj b/src/Validation.Common.Job/Validation.Common.Job.csproj
@@ -14,6 +14,10 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
   </PropertyGroup>
+  <PropertyGroup>
+    <Authors>.NET Foundation</Authors>
+    <IncludeSymbols Condition="'$(IncludeSymbols)' == ''">true</IncludeSymbols>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -90,6 +94,11 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions">
       <Version>1.1.2</Version>
     </PackageReference>
+    <PackageReference Include="NuGet.Build.Tasks.Pack">
+      <Version>4.8.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="NuGet.Packaging">
       <Version>4.8.0-preview4.5289</Version>
     </PackageReference>
@@ -127,11 +136,6 @@
       <Name>NuGet.Jobs.Common</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Validation.Common.Job.nuspec">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <SignPath>..\..\build</SignPath>

diff --git a/src/Validation.Common.Job/Validation.Common.Job.nuspec b/src/Validation.Common.Job/Validation.Common.Job.nuspec
diff --git a/src/Validation.ScanAndSign.Core/Validation.ScanAndSign.Core.csproj b/src/Validation.ScanAndSign.Core/Validation.ScanAndSign.Core.csproj
@@ -14,6 +14,10 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
   </PropertyGroup>
+  <PropertyGroup>
+    <Authors>.NET Foundation</Authors>
+    <IncludeSymbols Condition="'$(IncludeSymbols)' == ''">true</IncludeSymbols>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -54,6 +58,11 @@
     <PackageReference Include="Microsoft.Extensions.Options">
       <Version>1.1.2</Version>
     </PackageReference>
+    <PackageReference Include="NuGet.Build.Tasks.Pack">
+      <Version>4.8.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="NuGet.Services.ServiceBus">
       <Version>2.27.0</Version>
     </PackageReference>

diff --git a/src/Validation.Symbols.Core/Validation.Symbols.Core.csproj b/src/Validation.Symbols.Core/Validation.Symbols.Core.csproj
@@ -14,6 +14,10 @@
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
+  <PropertyGroup>
+    <Authors>.NET Foundation</Authors>
+    <IncludeSymbols Condition="'$(IncludeSymbols)' == ''">true</IncludeSymbols>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -58,6 +62,11 @@
     <Compile Include="ZipArchiveService.cs" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="NuGet.Build.Tasks.Pack">
+      <Version>4.8.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="NuGet.Services.ServiceBus">
       <Version>2.29.0</Version>
     </PackageReference>

diff --git a/tests/Validation.Common.Job.Tests/CsprojNuspecConsistencyFacts.cs b/tests/Validation.Common.Job.Tests/CsprojNuspecConsistencyFacts.cs
diff --git a/tests/Validation.Common.Job.Tests/Validation.Common.Job.Tests.csproj b/tests/Validation.Common.Job.Tests/Validation.Common.Job.Tests.csproj
@@ -42,7 +42,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CommonTelemetryServiceFacts.cs" />
-    <Compile Include="CsprojNuspecConsistencyFacts.cs" />
     <Compile Include="FileStreamUtilityFacts.cs" />
     <Compile Include="LoggerDiagnosticSourceFacts.cs" />
     <Compile Include="PathUtilityFacts.cs" />