Skip to content

Read PackageDefinitions and PackageDependencies from the cache assets file instead of ResolvePackageDependencies #28263

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

Closed
wants to merge 5 commits into from
Closed

Read PackageDefinitions and PackageDependencies from the cache assets file instead of ResolvePackageDependencies #28263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7bff950
Add output PackageDefinitions to ResolvePackageAssets
ocalles Sep 20, 2022
f045e6f
Add output PackageDependenciesBetweenPackages to ResolvePackageAssets
ocalles Sep 20, 2022
c817914
ResolvePackageDependencies only when EmitLegacyAssetsFileItem is true
ocalles Sep 23, 2022
d514de4
Increase version of cache assets file format
ocalles Sep 29, 2022
5e8fd8b
Code cleanup
ocalles Sep 29, 2022
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
45 changes: 11 additions & 34 deletions src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ public class GivenAResolvePackageDependenciesTask

[Theory]
[MemberData(nameof(ItemCounts))]
public void ItRaisesLockFileToMSBuildItems(string projectName, int[] counts, bool emitLegacyAssetsFileItems)
public void ItRaisesLockFileToMSBuildItems(string projectName, int[] counts)
{
var task = GetExecutedTaskFromPrefix(projectName, out _, emitLegacyAssetsFileItems);
var task = GetExecutedTaskFromPrefix(projectName, out _);

task.PackageDefinitions .Count().Should().Be(counts[0]);
task.FileDefinitions .Count().Should().Be(counts[1]);
Expand All @@ -40,36 +40,16 @@ public static IEnumerable<object[]> ItemCounts
{
new object[] {
"dotnet.new",
new int[] { 110, 2536, 1, 846, 73 },
true
},
new object[] {
"dotnet.new",
new int[] { 110, 0, 0, 846, 0 },
false
},
new object[] {
"simple.dependencies",
new int[] { 113, 2613, 1, 878, 94 },
true
new int[] { 110, 2536, 1, 845, 75 },
},
new object[] {
"simple.dependencies",
new int[] { 113, 0, 0, 878, 0 },
false
new int[] { 113, 2613, 1, 877, 96 },
},
};
}
}

[Fact]
public void ItOmitsLegacyItemsByDefault()
{
var task = new ResolvePackageDependencies();

task.EmitLegacyAssetsFileItems.Should().Be(false);
}

[Theory]
[InlineData("dotnet.new")]
[InlineData("simple.dependencies")]
Expand Down Expand Up @@ -584,8 +564,7 @@ public void ItAddsAnalyzerMetadataAndFileDependencies()
{
ProjectAssetsFile = lockFile.Path,
ProjectPath = null,
ProjectLanguage = projectLanguage, // set language
EmitLegacyAssetsFileItems = true
ProjectLanguage = projectLanguage // set language
};
task.Execute().Should().BeTrue();

Expand Down Expand Up @@ -669,8 +648,7 @@ public void ItFiltersAnalyzersByProjectLanguage()
{
ProjectAssetsFile = lockFile.Path,
ProjectPath = null,
ProjectLanguage = projectLanguage, // set language
EmitLegacyAssetsFileItems = true
ProjectLanguage = projectLanguage // set language
};
task.Execute().Should().BeTrue();

Expand Down Expand Up @@ -839,19 +817,19 @@ public void ItDoesNotThrowOnCrossTargetingWithTargetPlatforms()
GetExecutedTaskFromContents(lockFileContent, out _); // Task should not fail on matching framework names
}

private static ResolvePackageDependencies GetExecutedTaskFromPrefix(string lockFilePrefix, out LockFile lockFile, bool emitLegacyAssetsFileItems = true, string target = null)
private static ResolvePackageDependencies GetExecutedTaskFromPrefix(string lockFilePrefix, out LockFile lockFile, string target = null)
{
lockFile = TestLockFiles.GetLockFile(lockFilePrefix);
return GetExecutedTask(lockFile, emitLegacyAssetsFileItems, target);
return GetExecutedTask(lockFile, target);
}

private static ResolvePackageDependencies GetExecutedTaskFromContents(string lockFileContents, out LockFile lockFile, bool emitLegacyAssetsFileItems = true, string target = null)
private static ResolvePackageDependencies GetExecutedTaskFromContents(string lockFileContents, out LockFile lockFile, string target = null)
{
lockFile = TestLockFiles.CreateLockFile(lockFileContents);
return GetExecutedTask(lockFile, emitLegacyAssetsFileItems, target);
return GetExecutedTask(lockFile, target);
}

private static ResolvePackageDependencies GetExecutedTask(LockFile lockFile, bool emitLegacyAssetsFileItems, string target)
private static ResolvePackageDependencies GetExecutedTask(LockFile lockFile, string target)
{
var resolver = new MockPackageResolver(_packageRoot);

Expand All @@ -860,7 +838,6 @@ private static ResolvePackageDependencies GetExecutedTask(LockFile lockFile, boo
ProjectAssetsFile = lockFile.Path,
ProjectPath = _projectPath,
ProjectLanguage = null,
EmitLegacyAssetsFileItems = emitLegacyAssetsFileItems,
TargetFramework = target
};

Expand Down
Loading