Skip to content

Improves unexpected packages folder state error #1304

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 2 commits into from
Feb 20, 2022
Merged

Improves unexpected packages folder state error #1304

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfaaf6c
Improves unexpected packages folder state error
Evangelink Feb 17, 2022
5fea2da
Reuse variable for directory.exists
Evangelink Feb 17, 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
26 changes: 20 additions & 6 deletions test/coverlet.integration.tests/BaseTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,30 @@ protected BuildConfiguration GetAssemblyBuildConfiguration()

private protected string GetPackageVersion(string filter)
{
if (!Directory.Exists($"../../../../../bin/{GetAssemblyBuildConfiguration()}/Packages"))
string packagesPath = $"../../../../../bin/{GetAssemblyBuildConfiguration()}/Packages";

if (!Directory.Exists(packagesPath))
{
throw new DirectoryNotFoundException("Package directory not found, run 'dotnet pack' on repository root");
}

using Stream pkg = File.OpenRead(Directory.GetFiles($"../../../../../bin/{GetAssemblyBuildConfiguration()}/Packages", filter).Single());
using var reader = new PackageArchiveReader(pkg);
using Stream nuspecStream = reader.GetNuspec();
var manifest = Manifest.ReadFrom(nuspecStream, false);
return manifest.Metadata.Version.OriginalVersion;
var files = Directory.GetFiles(packagesPath, filter).ToList();
if (files.Count == 0)
{
throw new InvalidOperationException($"Could not find any package using filter '{filter}' in folder '{Path.GetFullPath(packagesPath)}'. Make sure 'dotnet pack' was called.");
}
else if (files.Count > 1)
{
throw new InvalidOperationException($"Found more than one package using filter '{filter}' in folder '{Path.GetFullPath(packagesPath)}'. Make sure 'dotnet pack' was only called once.");
}
else
{
using Stream pkg = File.OpenRead(files[0]);
using var reader = new PackageArchiveReader(pkg);
using Stream nuspecStream = reader.GetNuspec();
var manifest = Manifest.ReadFrom(nuspecStream, false);
return manifest.Metadata.Version.OriginalVersion;
}
}

private protected ClonedTemplateProject CloneTemplateProject(bool cleanupOnDispose = true, string testSDKVersion = "16.5.0")
Expand Down