diff options
Diffstat (limited to 'eng/packaging.targets')
| -rw-r--r-- | eng/packaging.targets | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/eng/packaging.targets b/eng/packaging.targets index 72401ef6da0..9fe4b569e5f 100644 --- a/eng/packaging.targets +++ b/eng/packaging.targets @@ -39,9 +39,15 @@ <UseIntellisenseDocumentationFile Condition="'$(UseIntellisenseDocumentationFile)' == '' and Exists('$(LibIntellisenseDocumentationFilePath)')">true</UseIntellisenseDocumentationFile> </PropertyGroup> - <PropertyGroup Condition="'$(ServicingVersion)' != ''"> + <PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'"> + <!-- If no servicing version is set we need to default to 0 in order for dependency versions to + be calculated propertly, if we don't set it to 0, we would get the dependency version using the + product Patch Version --> + <ServicingVersion Condition="'$(ServicingVersion)' == ''">0</ServicingVersion> + <!-- Always update the package version in servicing. --> - <VersionPrefix>$(MajorVersion).$(MinorVersion).$(ServicingVersion)</VersionPrefix> + <Version>$(MajorVersion).$(MinorVersion).$(ServicingVersion)</Version> + <Version Condition="'$(VersionSuffix)' != ''">$(Version)-$(VersionSuffix)</Version> <_IsWindowsDesktopApp Condition="$(WindowsDesktopCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsWindowsDesktopApp> <_IsAspNetCoreApp Condition="$(AspNetCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsAspNetCoreApp> <_AssemblyInTargetingPack Condition="('$(IsNETCoreAppSrc)' == 'true' or '$(_IsAspNetCoreApp)' == 'true' or '$(_IsWindowsDesktopApp)' == 'true') and '$(TargetFrameworkIdentifier)' != '.NETFramework'">true</_AssemblyInTargetingPack> @@ -267,9 +273,15 @@ </Target> <Target Name="ValidateAssemblyVersionsInRefPack" - Condition="$(_AssemblyInTargetingPack) == 'true' and '$(PreReleaseVersionLabel)' == 'servicing'" + Condition="'$(SkipValidateAssemblyVersion)' != 'true' and '$(_AssemblyInTargetingPack)' == 'true' and '$(PreReleaseVersionLabel)' == 'servicing'" AfterTargets="CoreCompile" > <Error Condition="'$(AssemblyVersion)' != '$(LastReleasedStableAssemblyVersion)'" Text="AssemblyVersion should match last released assembly version $(LastReleasedStableAssemblyVersion)" /> </Target> + <Target Name="ValidateServicingVersionIsPropertlySet" + Condition="'$(PreReleaseVersionLabel)' == 'servicing'" + AfterTargets="GenerateNuspec"> + <Error Condition="'$(ServicingVersion)' == '0'" Text="ServicingVersion is set to 0 and it should be an increment of the patch version from the last released package." /> + </Target> + </Project> |