Set PackageVersion in MSBuild to allow different versions at pack time

build.ps1

@@ -144,10 +144,12 @@ Invoke-BuildStep 'Signing the binaries' {
     -skip:$SkipArtifacts `
     -ev +BuildErrors
 
+$packageVersions = "/p:CommonPackageVersion=$CommonPackageVersion;GalleryPackageVersion=$GalleryPackageVersion;JobsPackageVersion=$JobsPackageVersion"
+
 Invoke-BuildStep 'Creating common artifacts' {
         $CommonPackages = $CommonProjects | Where-Object { $_.IsSrc }
         $CommonPackages | ForEach-Object {
-            New-ProjectPackage $_.Path -Configuration $Configuration -BuildNumber $BuildNumber -Version $CommonPackageVersion
+            New-ProjectPackage $_.Path -Configuration $Configuration -Symbols -Options $packageVersions
         }
     } `
     -skip:($SkipCommon -or $SkipArtifacts) `
@@ -160,7 +162,7 @@ Invoke-BuildStep 'Creating gallery artifacts' { `
             "src\NuGetGallery.Core\NuGetGallery.Core.csproj",
             "src\NuGetGallery.Services\NuGetGallery.Services.csproj"
         $GalleryProjects | ForEach-Object {
-            New-ProjectPackage (Join-Path $PSScriptRoot $_) -Configuration $Configuration -BuildNumber $BuildNumber -Version $GalleryPackageVersion -Branch $Branch -Symbols
+            New-ProjectPackage (Join-Path $PSScriptRoot $_) -Configuration $Configuration -Symbols -Options $packageVersions
         }
 
         $GalleryNuspecProjects =
@@ -197,7 +199,7 @@ Invoke-BuildStep 'Creating jobs artifacts' {
             "src\Validation.ScanAndSign.Core\Validation.ScanAndSign.Core.csproj",
             "src\Validation.Symbols.Core\Validation.Symbols.Core.csproj"
         $JobsProjects | ForEach-Object {
-            New-ProjectPackage (Join-Path $PSScriptRoot $_) -Configuration $Configuration -BuildNumber $BuildNumber -Version $JobsPackageVersion -Branch $Branch -Symbols
+            New-ProjectPackage (Join-Path $PSScriptRoot $_) -Configuration $Configuration -Symbols -Options $packageVersions
         }
 
         $JobsNuspecProjects =

build/common.ps1

@@ -762,7 +762,8 @@ Function New-ProjectPackage {
         [string]$Branch,
         [switch]$IncludeReferencedProjects,
         [switch]$Sign,
-        [switch]$BinLog
+        [switch]$BinLog,
+        [string[]]$Options
     )
     Trace-Log "Creating package from @""$TargetFilePath"""
 
@@ -789,6 +790,8 @@ Function New-ProjectPackage {
     }
     elseif ($ReleaseLabel) {
         $PackageVersion = Get-PackageVersion $ReleaseLabel $BuildNumber
+    } else {
+        $PackageVersion = $null
     }
 
     if ($PackageVersion) {
@@ -811,6 +814,10 @@ Function New-ProjectPackage {
         $opts += "/bl"
     }
 
+    if ($Options) {
+        $opts += $Options
+    }
+
     if (-not (Test-Path $Artifacts)) {
         New-Item $Artifacts -Type Directory
     }

src/Catalog/NuGet.Services.Metadata.Catalog.csproj

@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\SdkProjects.props" />
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.1</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(JobsPackageVersion)</PackageVersion>
     <Description>Create, edit, or read the package metadata catalog.</Description>
     <PackageTags>nuget;services;search;catalog;metadata;collector</PackageTags>
   </PropertyGroup>

src/Microsoft.PackageManagement.Search.Web/Microsoft.PackageManagement.Search.Web.csproj

@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\SdkProjects.props" />
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(JobsPackageVersion)</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.1</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(JobsPackageVersion)</PackageVersion>
     <RootNamespace>NuGet.Jobs</RootNamespace>
     <Description>Common infrastructure for running the NuGetGallery back-end jobs.</Description>
   </PropertyGroup>

src/NuGet.Protocol.Catalog/NuGet.Protocol.Catalog.csproj

@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\SdkProjects.props" />
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(JobsPackageVersion)</PackageVersion>
     <Description>A .NET library for consuming the NuGet API's catalog resource.</Description>
   </PropertyGroup>
 

src/NuGet.Services.AzureSearch/NuGet.Services.AzureSearch.csproj

@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\SdkProjects.props" />
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.1</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(JobsPackageVersion)</PackageVersion>
     <Description>Push NuGetGallery DB packages or catalog leaves to Azure Search.</Description>
     <PackageTags>nuget azure search catalog leaf details incremental collector</PackageTags>
   </PropertyGroup>

src/NuGet.Services.Build/NuGet.Services.Build.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Shared component to assist NuGet build scripts.</Description>
 
     <!--

src/NuGet.Services.Configuration/NuGet.Services.Configuration.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Shared configuration management NuGet services.</Description>
   </PropertyGroup>
 

src/NuGet.Services.Contracts/NuGet.Services.Contracts.csproj

@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\SdkProjects.props" />
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Interfaces used for NuGet services</Description>
   </PropertyGroup>
 

src/NuGet.Services.Cursor/NuGet.Services.Cursor.csproj

@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\SdkProjects.props" />
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Shared cursor classes</Description>
   </PropertyGroup>
 

src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj

@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\SdkProjects.props" />
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(GalleryPackageVersion)</PackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <Description>Core support library for NuGet database migration</Description>

src/NuGet.Services.Entities/NuGet.Services.Entities.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.1</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(GalleryPackageVersion)</PackageVersion>
     <Description>Entities used for NuGet services</Description>
   </PropertyGroup>
 

src/NuGet.Services.FeatureFlags/NuGet.Services.FeatureFlags.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Dynamic feature toggles</Description>
   </PropertyGroup>
 

src/NuGet.Services.Incidents/NuGet.Services.Incidents.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>A framework to access the NuGet incident API.</Description>
   </PropertyGroup>
 

src/NuGet.Services.KeyVault/NuGet.Services.KeyVault.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Key vault access for NuGet services</Description>
   </PropertyGroup>
 

src/NuGet.Services.Licenses/NuGet.Services.Licenses.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Common license expression code</Description>
   </PropertyGroup>
 

src/NuGet.Services.Logging/NuGet.Services.Logging.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Shared server-side logging component for NuGet services.</Description>
   </PropertyGroup>
 

src/NuGet.Services.Messaging.Email/NuGet.Services.Messaging.Email.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Components shared between the front-end and back-end concerning email messaging</Description>
   </PropertyGroup>
 

src/NuGet.Services.Messaging/NuGet.Services.Messaging.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Logic shared between the front-end and back-end concerning asynchronous messaging</Description>
   </PropertyGroup>
 

src/NuGet.Services.Metadata.Catalog.Monitoring/NuGet.Services.Metadata.Catalog.Monitoring.csproj

@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\SdkProjects.props" />
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(JobsPackageVersion)</PackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <Description>Monitor the package metadata catalog.</Description>

src/NuGet.Services.Owin/NuGet.Services.Owin.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Shared OWIN code for the NuGet projects</Description>
   </PropertyGroup>
 

src/NuGet.Services.ServiceBus/NuGet.Services.ServiceBus.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Integration with Azure Service Bus</Description>
   </PropertyGroup>
 

src/NuGet.Services.Sql/NuGet.Services.Sql.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Azure SQL access for NuGet services</Description>
   </PropertyGroup>
 

src/NuGet.Services.Status.Table/NuGet.Services.Status.Table.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Contract to store NuGet service status in tables.</Description>
   </PropertyGroup>
 

src/NuGet.Services.Status/NuGet.Services.Status.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>A framework to produce and consume status reported about NuGet services.</Description>
   </PropertyGroup>
 

src/NuGet.Services.Storage/NuGet.Services.Storage.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Shared server-side storage component for NuGet services</Description>
   </PropertyGroup>
 

src/NuGet.Services.Testing.Entities/NuGet.Services.Testing.Entities.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Infrastructure to unit test Entity Framework entities.</Description>
   </PropertyGroup>
 

src/NuGet.Services.V3/NuGet.Services.V3.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.1</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(JobsPackageVersion)</PackageVersion>
     <Description>Common infrastructure for V3 back-end jobs, including catalog abstractions and dependency injection setup.</Description>
   </PropertyGroup>
 

src/NuGet.Services.Validation.Issues/NuGet.Services.Validation.Issues.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>User-visible issues emitted by NuGet services</Description>
   </PropertyGroup>
 

src/NuGet.Services.Validation/NuGet.Services.Validation.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(CommonPackageVersion)</PackageVersion>
     <Description>Logic shared between the front-end and back-end concerning asynchronous validation</Description>
 
     <!--

src/NuGetGallery.Core/NuGetGallery.Core.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.1</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(GalleryPackageVersion)</PackageVersion>
     <RootNamespace>NuGetGallery</RootNamespace>
     <Description>Core support library for NuGet Gallery Frontend and Backend</Description>
   </PropertyGroup>

src/NuGetGallery.Services/NuGetGallery.Services.csproj

@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\SdkProjects.props" />
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.1</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(GalleryPackageVersion)</PackageVersion>
     <Description>Services library for NuGet Gallery Frontend and Backend</Description>
   </PropertyGroup>
 

src/Stats.LogInterpretation/Stats.LogInterpretation.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(JobsPackageVersion)</PackageVersion>
     <PackageId>NuGet.Stats.LogInterpretation</PackageId>
   </PropertyGroup>
 

src/Validation.Common.Job/Validation.Common.Job.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.1</TargetFrameworks>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(JobsPackageVersion)</PackageVersion>
     <RootNamespace>NuGet.Jobs.Validation</RootNamespace>
     <AssemblyName>NuGet.Services.Validation.Common.Job</AssemblyName>
     <Description>Common job infrastructure for validation jobs and basic dependency injection setup.</Description>

src/Validation.ContentScan.Core/Validation.ContentScan.Core.csproj

@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\SdkProjects.props" />
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(JobsPackageVersion)</PackageVersion>
     <RootNamespace>NuGet.Jobs.Validation.ContentScan</RootNamespace>
     <AssemblyName>NuGet.Jobs.Validation.ContentScan.Core</AssemblyName>
   </PropertyGroup>

src/Validation.ScanAndSign.Core/Validation.ScanAndSign.Core.csproj

@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\SdkProjects.props" />
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(JobsPackageVersion)</PackageVersion>
     <RootNamespace>NuGet.Jobs.Validation.ScanAndSign</RootNamespace>
     <AssemblyName>NuGet.Jobs.Validation.ScanAndSign.Core</AssemblyName>
   </PropertyGroup>

src/Validation.Symbols.Core/Validation.Symbols.Core.csproj

@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\SdkProjects.props" />
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">$(JobsPackageVersion)</PackageVersion>
     <RootNamespace>NuGet.Jobs.Validation.Symbols.Core</RootNamespace>
     <AssemblyName>NuGet.Jobs.Validation.Symbols.Core</AssemblyName>
   </PropertyGroup>