Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update packaging.targets
  • Loading branch information
ViktorHofer authored Nov 14, 2023
commit b316eb91233392dcdd1b403f6dc30e8e8ffabe4c
9 changes: 7 additions & 2 deletions eng/packaging.targets
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
'$(SuppressFinalPackageVersion)' == 'true' or
'$(DotNetBuildFromSource)' == 'true'">true</DisablePackageBaselineValidation>
<PackageValidationBaselineVersion Condition="'$(PackageValidationBaselineVersion)' == ''">$(ApiCompatNetCoreAppBaselineVersion)</PackageValidationBaselineVersion>
<!-- In servicing, the live package is compared against the GA version in strict mode. -->
<EnableStrictModeForBaselineValidation Condition="'$(DotNetFinalVersionKind)' == 'servicing'">true</EnableStrictModeForBaselineValidation>

<BeforePack>$(BeforePack);IncludeAnalyzersInPackage;AddNETStandardCompatErrorFileForPackaging</BeforePack>
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddRuntimeSpecificFilesToPackage;IncludeProjectReferencesWithPackAttributeInPackage</TargetsForTfmSpecificContentInPackage>
Expand Down Expand Up @@ -40,6 +38,13 @@
<BuildProjectReferences Condition="'$(NoBuild)' == 'true'">false</BuildProjectReferences>
</PropertyGroup>

<PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
<!-- In servicing, the live package is compared against the GA version in strict mode. -->
<EnableStrictModeForBaselineValidation>true</EnableStrictModeForBaselineValidation>
<!-- In servicing, disable the APICompat rule that validates that the assembly versions must match. -->
<NoWarn>$(NoWarn);CP0003</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing' and
'$(PackageUseIncrementalServicingVersion)' == 'true'">
<!-- If no servicing version is set we need to default to 0 in order for dependency versions to
Expand Down