Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 5 additions & 1 deletion src/NuGetizer.Tasks/InferImplicitPackageReference.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ static PackageIdentity parse(string value)
// the right version if the project is using centrally managed versions
var primaryReference = PackageReferences.FirstOrDefault(x => x.ItemSpec == identity.Id);
if (primaryReference != null && primaryReference.GetNullableMetadata("Version") == null)
primaryReference.SetMetadata("Version", identity.Version);
{
// If VersionOverride is specified (CPM feature), use it instead of the resolved version
var versionOverride = primaryReference.GetNullableMetadata("VersionOverride");
primaryReference.SetMetadata("Version", versionOverride ?? identity.Version);
}
}
}

Expand Down
11 changes: 10 additions & 1 deletion src/NuGetizer.Tasks/NuGetizer.Inference.targets
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ Copyright (c) .NET Foundation. All rights reserved.
</_ReferenceRelatedPaths>
<PackageDependencies>
<ParentPackage />
<ParentTarget />
</PackageDependencies>
</ItemDefinitionGroup>

Expand Down Expand Up @@ -445,14 +446,22 @@ Copyright (c) .NET Foundation. All rights reserved.
<PropertyGroup>
<_CandidatePackageId>%(PackageReference.Identity)</_CandidatePackageId>
<_CandidatePackageVersion>%(PackageReference.Version)</_CandidatePackageVersion>
<_CandidatePackageVersionOverride>%(PackageReference.VersionOverride)</_CandidatePackageVersionOverride>
<_CandidatePackageIsImplicit>%(PackageReference.IsImplicitlyDefined)</_CandidatePackageIsImplicit>
</PropertyGroup>

<!-- If VersionOverride is set (CPM feature), use it directly -->
<ItemGroup Condition="$(_CandidatePackageIsImplicit) != 'true' and '$(_CandidatePackageVersionOverride)' != ''">
<PackageReference Update="$(_CandidatePackageId)" Version="$(_CandidatePackageVersionOverride)" />
</ItemGroup>

<ItemGroup Condition="$(_CandidatePackageIsImplicit) != 'true' and
'$(_CandidatePackageVersionOverride)' == '' and
($(_CandidatePackageVersion) == '' or $(_CandidatePackageVersion.Contains('*')))">
<_ResolvedPackageDependency Include="@(PackageDependencies)"
Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').StartsWith('$(_CandidatePackageId)/')) and
$([MSBuild]::ValueOrDefault('%(ParentPackage)', '')) == ''" />
$([MSBuild]::ValueOrDefault('%(ParentPackage)', '')) == '' and
$([MSBuild]::ValueOrDefault('%(ParentTarget)', '')) == '$(TargetFramework)'" />
</ItemGroup>

<PropertyGroup Condition="'@(_ResolvedPackageDependency)' != ''">
Expand Down
42 changes: 42 additions & 0 deletions src/NuGetizer.Tests/given_packagereferences.cs
Original file line number Diff line number Diff line change
Expand Up @@ -349,5 +349,47 @@ public void when_centrally_managed_version_private_assets_then_adds_versioned_pr
Version = "4.4.1"
}));
}

[Fact]
public void when_centrally_managed_with_version_override_then_uses_override()
{
var result = Builder.BuildProject(@"
<Project Sdk='Microsoft.NET.Sdk'>
<PropertyGroup>
<PackageId>Library</PackageId>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include='Newtonsoft.Json' VersionOverride='11.0.2' />
<PackageReference Include='Castle.Core' />
</ItemGroup>
</Project>",
output: output,
files: ("Directory.Packages.props", @"
<Project>
<ItemGroup>
<PackageVersion Include='Newtonsoft.Json' Version='12.0.3' />
<PackageVersion Include='Castle.Core' Version='4.4.1' />
</ItemGroup>
</Project>
"));

result.AssertSuccess(output);
// VersionOverride should take precedence over the centrally managed version
Assert.Contains(result.Items, item => item.Matches(new
{
PackFolder = PackFolderKind.Dependency,
Identity = "Newtonsoft.Json",
Version = "11.0.2"
}));
// Castle.Core should use the centrally managed version
Assert.Contains(result.Items, item => item.Matches(new
{
PackFolder = PackFolderKind.Dependency,
Identity = "Castle.Core",
Version = "4.4.1"
}));
}
}
}