@@ -432,7 +432,7 @@ Copyright (c) .NET Foundation. All rights reserved.
432432 <Target Name =" _UpdatePackageReferenceVersions"
433433 Inputs =" @(PackageReference)"
434434 Outputs =" |%(Identity)|"
435- Condition =" '$(UsingMicrosoftNETSdk)' == 'true' and '$(ManagePackageVersionsCentrally)' == 'true' "
435+ Condition =" '$(UsingMicrosoftNETSdk)' == 'true'"
436436 DependsOnTargets =" RunResolvePackageDependencies"
437437 Returns =" @(_CentrallyManagedDependency)" >
438438
@@ -442,19 +442,20 @@ Copyright (c) .NET Foundation. All rights reserved.
442442 <_CandidatePackageIsImplicit >%(PackageReference.IsImplicitlyDefined)</_CandidatePackageIsImplicit >
443443 </PropertyGroup >
444444
445- <ItemGroup Condition =" '$(_CandidatePackageVersion)' == '' and '$(_CandidatePackageIsImplicit)' != 'true'" >
446- <_CentrallyManagedDependency Include =" @(PackageDependencies)"
447- Condition =" $([MSBuild]::ValueOrDefault('%(Identity)', '').StartsWith('$(_CandidatePackageId)/')) and
448- $([MSBuild]::ValueOrDefault('%(ParentPackage)', '')) == ''" />
445+ <ItemGroup Condition =" $(_CandidatePackageIsImplicit) != 'true' and
446+ ($(_CandidatePackageVersion) == '' or $(_CandidatePackageVersion.Contains('*')))" >
447+ <_ResolvedPackageDependency Include =" @(PackageDependencies)"
448+ Condition =" $([MSBuild]::ValueOrDefault('%(Identity)', '').StartsWith('$(_CandidatePackageId)/')) and
449+ $([MSBuild]::ValueOrDefault('%(ParentPackage)', '')) == ''" />
449450 </ItemGroup >
450451
451- <PropertyGroup Condition =" '@(_CentrallyManagedDependency )' != ''" >
452- <_CentrallyManagedDependency >%(_CentrallyManagedDependency .Identity)</_CentrallyManagedDependency >
453- <_CentrallyManagedVersion >$(_CentrallyManagedDependency .Replace('$(_CandidatePackageId)/', ''))</_CentrallyManagedVersion >
452+ <PropertyGroup Condition =" '@(_ResolvedPackageDependency )' != ''" >
453+ <_ResolvedPackageDependency >%(_ResolvedPackageDependency .Identity)</_ResolvedPackageDependency >
454+ <_ResolvedPackageVersion >$(_ResolvedPackageDependency .Replace('$(_CandidatePackageId)/', ''))</_ResolvedPackageVersion >
454455 </PropertyGroup >
455456
456- <ItemGroup Condition =" '$(_CentrallyManagedVersion )' != ''" >
457- <PackageReference Update =" @(PackageReference)" Version =" $(_CentrallyManagedVersion )" />
457+ <ItemGroup Condition =" '$(_ResolvedPackageVersion )' != ''" >
458+ <PackageReference Update =" @(PackageReference)" Version =" $(_ResolvedPackageVersion )" />
458459 </ItemGroup >
459460
460461 </Target >
0 commit comments