Skip to content

Commit 471e20e

Browse files
AnipikViktorHofer
andauthored
Set PackageValidationBaselineName to assemblyName when packageID is not set (#18658)
* set PackageValidationBaselineName to assembly name when packageID is not set. * use value or default Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com> * Apply suggestions from code review Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com> * inlining the PackageValidationBaselineName * Apply suggestions from code review Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent 730316d commit 471e20e

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

src/Compatibility/Microsoft.DotNet.PackageValidation/build/Microsoft.DotNet.PackageValidation.targets

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@
22
<Project>
33
<UsingTask TaskName="Microsoft.DotNet.PackageValidation.ValidatePackage" AssemblyFile="$(DotNetPackageValidationAssembly)" />
44

5-
<PropertyGroup>
6-
<PackageValidationBaselineName>$([MSBuild]::ValueOrDefault('$(PackageValidationBaselineName)', '$(PackageId)'))</PackageValidationBaselineName>
7-
</PropertyGroup>
8-
95
<ItemGroup Condition="'$(PackageValidationBaselinePath)' == '' and '$(PackageValidationBaselineVersion)' != ''">
10-
<PackageDownload Include="$(PackageValidationBaselineName)" Version="[$(PackageValidationBaselineVersion)]" />
6+
<PackageDownload Include="$([MSBuild]::ValueOrDefault('$(PackageValidationBaselineName)', '$(PackageId)'))" Version="[$(PackageValidationBaselineVersion)]" />
117
</ItemGroup>
128

139
<Target Name="RunPackageValidation"
1410
AfterTargets="Pack"
1511
Condition="'$(IsPackable)' == 'true'">
1612

1713
<PropertyGroup>
14+
<PackageValidationBaselineName Condition="'$(PackageValidationBaselineName)' == ''">$(PackageId)</PackageValidationBaselineName>
1815
<PackageValidationBaselinePath Condition="'$(PackageValidationBaselinePath)' == '' and '$(PackageValidationBaselineVersion)' != ''">$([MSBuild]::NormalizePath('$(NuGetPackageRoot)', '$(PackageValidationBaselineName.ToLower())', '$(PackageValidationBaselineVersion)', '$(PackageValidationBaselineName.ToLower()).$(PackageValidationBaselineVersion).nupkg'))</PackageValidationBaselinePath>
1916
<GenerateCompatibilitySuppressionFile Condition="'$(GenerateCompatibilitySuppressionFile)' == ''">false</GenerateCompatibilitySuppressionFile>
2017
<_compatibilitySuppressionFilePath>$([MSBuild]::NormalizePath('$(MSBuildProjectDirectory)', 'CompatibilitySuppressions.xml'))</_compatibilitySuppressionFilePath>

0 commit comments

Comments
 (0)