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
1 change: 1 addition & 0 deletions .archonanalysers
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
archon_004.forbidden_namespace_references = PackageCascade.Internal.Planning->PackageCascade.Internal.Executing, PackageCascade.Internal.Planning->PackageCascade.Internal.Rollback, PackageCascade.Internal.Executing->PackageCascade.Internal.Planning, PackageCascade.Internal.Executing->PackageCascade.Internal.Rollback, PackageCascade.Internal.Rollback->PackageCascade.Internal.Planning, PackageCascade.Internal.Rollback->PackageCascade.Internal.Executing
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Text.Json;
using PackageCascade.Cli.Serialization;
using PackageCascade.Public.Planning.Definition;
using PackageCascade.Public.Definition;

namespace PackageCascade.Cli.Tests.Unit.Serialization;

Expand All @@ -12,9 +12,10 @@ public async Task PlanRoundTripsWithVersionAndEveryReasonCase()
ReleasePlan plan = new(
[new PlannedRelease("Fixture", "src/Fixture/Fixture.csproj", "1.2.4-beta.1",
[new ConventionalCommitReason(SemverBump.Minor, ["abc"]),
new DependencyReleaseReason("Foundation")]),
new DependencyReleaseReason("Foundation")], ["Foundation"]),
new PlannedRelease("NewPackage", "src/NewPackage/NewPackage.csproj", "0.1.0",
[new InitialReleaseReason()])], "target-sha", "Release");
[new InitialReleaseReason()], [])], "target-sha", "Release",
[new ReferencedPackage("Foundation", "src/Foundation/Foundation.csproj", "3.2.1")], "solutions");

string json = JsonSerializer.Serialize(plan, PlanJsonOptions.Options);
ReleasePlan? copy = JsonSerializer.Deserialize<ReleasePlan>(json, PlanJsonOptions.Options);
Expand All @@ -31,6 +32,9 @@ [new ConventionalCommitReason(SemverBump.Minor, ["abc"]),
await Assert.That(copy.Packages[1].Version).IsEqualTo("0.1.0");
await Assert.That(copy.TargetCommitSha).IsEqualTo("target-sha");
await Assert.That(copy.Configuration).IsEqualTo("Release");
await Assert.That(copy.WorkingDirectory).IsEqualTo("solutions");
await Assert.That(package.DependencyIds).IsEquivalentTo(["Foundation"]);
await Assert.That(copy.ReferencedPackages.Single()).IsEqualTo(new ReferencedPackage("Foundation", "src/Foundation/Foundation.csproj", "3.2.1"));
}
}
}
2 changes: 1 addition & 1 deletion src/PackageCascade.Cli/Commands/PlanCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using JetBrains.Annotations;
using PackageCascade.Cli.Serialization;
using PackageCascade.Public.Planning;
using PackageCascade.Public.Planning.Definition;
using PackageCascade.Public.Definition;

namespace PackageCascade.Cli.Commands;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Text.Json;
using System.Text.Json.Serialization;
using PackageCascade.Public.Planning.Definition;
using PackageCascade.Public.Definition;

namespace PackageCascade.Cli.Serialization;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.Extensions.DependencyInjection;
using PackageCascade.Cli;
using PackageCascade.Public.Planning;
using PackageCascade.Public.Planning.Definition;
using PackageCascade.Public.Definition;
using System.Text.Json;

namespace PackageCascade.Tests.Integration.CliOnly;
Expand Down Expand Up @@ -68,7 +68,8 @@ public async Task PlanWritesReadableVersionsAndReasonTypes()
ReleasePlan plan = new(
[new PlannedRelease("Fixture", "src/Fixture/Fixture.csproj", "1.2.4",
[new ConventionalCommitReason(SemverBump.Patch, ["abc"]),
new DependencyReleaseReason("Foundation")])], "target-sha", "Release");
new DependencyReleaseReason("Foundation")], ["Foundation"])], "target-sha", "Release",
[new ReferencedPackage("Foundation", "src/Foundation/Foundation.csproj", "3.2.1")], ".");
StubPlanner planner = new(plan);
TestBootstrap bootstrap = new(services => services.AddSingleton<IPackageCascadePlanner>(planner));
string outputPath = Path.Combine(_directory, "plan.json");
Expand Down Expand Up @@ -107,7 +108,7 @@ public ReleasePlan Generate(string repositoryPath, string solutionPath, string c
SolutionPath = solutionPath;
Configuration = configuration;

return _plan ?? new([], "target-sha", configuration);
return _plan ?? new([], "target-sha", configuration, [], ".");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.Extensions.DependencyInjection;
using PackageCascade.Public.DependencyInjection;
using PackageCascade.Public.Planning;
using PackageCascade.Public.Planning.Definition;
using PackageCascade.Public.Definition;

namespace PackageCascade.Tests.Integration.CoreOnly.Planning;

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using LibGit2Sharp;
using PackageCascade.Internal.Executing.Git;
using PackageCascade.Public.Planning.Definition;
using PackageCascade.Public.Definition;

namespace PackageCascade.Tests.Unit.Internal.Executing.Git;

Expand Down Expand Up @@ -105,5 +105,5 @@ private Commit Commit(string contents)
}

private static ReleasePlan Plan(Commit target, params (string PackageId, string Version)[] packages)
=> new(packages.Select(package => new PlannedRelease(package.PackageId, $"{package.PackageId}.csproj", package.Version, [])).ToArray(), target.Sha, "Release");
=> new(packages.Select(package => new PlannedRelease(package.PackageId, $"{package.PackageId}.csproj", package.Version, [], [])).ToArray(), target.Sha, "Release", [], ".");
}
Loading
Loading