Skip to content

Resolve wildcard dependency just like central package versions #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2023
Merged

Resolve wildcard dependency just like central package versions #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions src/NuGetizer.Tasks/NuGetizer.Inference.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<Target Name="_UpdatePackageReferenceVersions"
Inputs="@(PackageReference)"
Outputs="|%(Identity)|"
Condition="'$(UsingMicrosoftNETSdk)' == 'true' and '$(ManagePackageVersionsCentrally)' == 'true'"
Condition="'$(UsingMicrosoftNETSdk)' == 'true'"
DependsOnTargets="RunResolvePackageDependencies"
Returns="@(_CentrallyManagedDependency)">

Expand All @@ -442,19 +442,20 @@ Copyright (c) .NET Foundation. All rights reserved.
<_CandidatePackageIsImplicit>%(PackageReference.IsImplicitlyDefined)</_CandidatePackageIsImplicit>
</PropertyGroup>

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

<PropertyGroup Condition="'@(_CentrallyManagedDependency)' != ''">
<_CentrallyManagedDependency>%(_CentrallyManagedDependency.Identity)</_CentrallyManagedDependency>
<_CentrallyManagedVersion>$(_CentrallyManagedDependency.Replace('$(_CandidatePackageId)/', ''))</_CentrallyManagedVersion>
<PropertyGroup Condition="'@(_ResolvedPackageDependency)' != ''">
<_ResolvedPackageDependency>%(_ResolvedPackageDependency.Identity)</_ResolvedPackageDependency>
<_ResolvedPackageVersion>$(_ResolvedPackageDependency.Replace('$(_CandidatePackageId)/', ''))</_ResolvedPackageVersion>
</PropertyGroup>

<ItemGroup Condition="'$(_CentrallyManagedVersion)' != ''">
<PackageReference Update="@(PackageReference)" Version="$(_CentrallyManagedVersion)" />
<ItemGroup Condition="'$(_ResolvedPackageVersion)' != ''">
<PackageReference Update="@(PackageReference)" Version="$(_ResolvedPackageVersion)" />
</ItemGroup>

</Target>
Expand Down
27 changes: 27 additions & 0 deletions src/NuGetizer.Tests/given_packinference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,5 +628,32 @@ public void when_packing_dependencies_then_includes_satellite_resources_for_priv
}));
}

[Fact]
public void when_packing_dependencies_then_resolves_wildcard()
{
var result = Builder.BuildProject(
"""
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netstandard2.0</TargetFramework>
<IsPackable>true</IsPackable>
<LangVersion>Latest</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.*" />
</ItemGroup>
</Project>
""", output: output);

result.AssertSuccess(output);

Assert.DoesNotContain(result.Items, item => item.Matches(new
{
PackFolder = "Dependency",
Version = "4.0.*",
}));
}
}
}