Skip to content

Fix issue with CentralPackageVersions logging error when using a custom import pattern. #325

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
jeffkl merged 1 commit into from
Dec 2, 2021
Merged

Fix issue with CentralPackageVersions logging error when using a custom import pattern. #325

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
39 changes: 34 additions & 5 deletions src/CentralPackageVersions.UnitTests/CentralPackageVersionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,15 +496,44 @@ public void VersionOverridesWithoutCentralVersionsCanBeDisabled(string projectFi
buildOutput.Errors.ShouldBe(new[] { $"The package reference \'Orphan\' must have a version defined in \'{packagesProps.FullPath}\'." });
}

private ProjectCreator WritePackagesProps()
[Fact]
public void WorksWithCustomImportPattern()
{
ProjectCreator.Create()
.Save(Path.Combine(TestRootPath, "Directory.Build.props"));
WritePackagesProps(writeDirectoryBuildPropsTargets: false);

ProjectCreator.Create()
ProjectCreator customProps = ProjectCreator.Create()
.ImportSdk("Sdk.props", "Microsoft.NET.Sdk")
.Save(Path.Combine(TestRootPath, "Custom.props"));

ProjectCreator customTargets = ProjectCreator.Create()
.ImportSdk("Sdk.targets", "Microsoft.NET.Sdk")
.Import(Path.Combine(ThisAssemblyDirectory, @"Sdk\Sdk.props"))
.Import(Path.Combine(ThisAssemblyDirectory, @"Sdk\Sdk.targets"))
.Save(Path.Combine(TestRootPath, "Directory.Build.targets"));
.Save(Path.Combine(TestRootPath, "Custom.targets"));

ProjectCreator.Create()
.Import(customProps)
.Property("TargetFramework", "net45")
.ItemPackageReference("Foo")
.Import(customTargets)
.Save(GetTempFileWithExtension(".csproj"))
.TryBuild("CheckPackageReferences", out bool result, out BuildOutput buildOutput);

result.ShouldBeTrue(buildOutput.GetConsoleLog());
}

private ProjectCreator WritePackagesProps(bool writeDirectoryBuildPropsTargets = true)
{
if (writeDirectoryBuildPropsTargets)
{
ProjectCreator.Create()
.Save(Path.Combine(TestRootPath, "Directory.Build.props"));

ProjectCreator.Create()
.Import(Path.Combine(ThisAssemblyDirectory, @"Sdk\Sdk.props"))
.Import(Path.Combine(ThisAssemblyDirectory, @"Sdk\Sdk.targets"))
.Save(Path.Combine(TestRootPath, "Directory.Build.targets"));
}

return ProjectCreator.Templates
.PackagesProps(
Expand Down
2 changes: 1 addition & 1 deletion src/CentralPackageVersions/Sdk/Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<!--
Keep track if this file was imported before Directory.Build.targets
-->
<_WasMicrosoftCentralPackageVersionsSdkImportedInDirectoryBuildTargets Condition="'$(_WasMicrosoftCentralPackageVersionsSdkImportedInDirectoryBuildTargets)' == '' And '$(DirectoryBuildTargetsPath)' == ''">false</_WasMicrosoftCentralPackageVersionsSdkImportedInDirectoryBuildTargets>
<_WasMicrosoftCentralPackageVersionsSdkImportedInDirectoryBuildTargets Condition="'$(_WasMicrosoftCentralPackageVersionsSdkImportedInDirectoryBuildTargets)' == '' And '$(CommonTargetsPath)' == ''">false</_WasMicrosoftCentralPackageVersionsSdkImportedInDirectoryBuildTargets>
<!--
Walk up the directory tree looking for a Packages.props, unless a user has already specified a path.
-->
Expand Down