diff --git a/build/Build.cs b/build/Build.cs index fc884944a..04d5690f4 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -21,7 +21,6 @@ [ShutdownDotNetAfterServerBuild] partial class Build : FalloutBuild, - IHasChangelog, IHasGitRepository, IHasSolution, IRestore, diff --git a/src/Fallout.Components/ICreateGitHubRelease.cs b/src/Fallout.Components/ICreateGitHubRelease.cs index f730d0854..8f5e6af1b 100644 --- a/src/Fallout.Components/ICreateGitHubRelease.cs +++ b/src/Fallout.Components/ICreateGitHubRelease.cs @@ -14,7 +14,7 @@ namespace Fallout.Components; [ParameterPrefix(GitHubRelease)] -public interface ICreateGitHubRelease : IHasGitRepository, IHasChangelog +public interface ICreateGitHubRelease : IHasGitRepository { const string GitHubRelease = nameof(GitHubRelease); @@ -42,7 +42,7 @@ async Task GetOrCreateRelease() Name = Name, Prerelease = Prerelease, Draft = Draft, - Body = ChangelogTasks.ExtractChangelogSectionNotes(ChangelogFile).JoinNewLine() + Body = "" }); } diff --git a/src/Fallout.Components/IHasChangelog.cs b/src/Fallout.Components/IHasChangelog.cs deleted file mode 100644 index 1aeff4d5b..000000000 --- a/src/Fallout.Components/IHasChangelog.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Linq; -using Fallout.Common; -using static Fallout.Common.ChangeLog.ChangelogTasks; - -namespace Fallout.Components; - -public interface IHasChangelog : IFalloutBuild -{ - // TODO: assert file exists - string ChangelogFile => RootDirectory / "CHANGELOG.md"; - string NuGetReleaseNotes => GetNuGetReleaseNotes(ChangelogFile, (this as IHasGitRepository)?.GitRepository); -} \ No newline at end of file diff --git a/src/Fallout.Components/IPack.cs b/src/Fallout.Components/IPack.cs index 9b3a66a4b..5e05eca01 100644 --- a/src/Fallout.Components/IPack.cs +++ b/src/Fallout.Components/IPack.cs @@ -37,9 +37,7 @@ public interface IPack : ICompile, IHasArtifacts .WhenNotNull(this as IHasGitVersion, (_, o) => _ .SetVersion(o.Versioning.NuGetVersionV2)) .WhenNotNull(this as IHasNerdbankGitVersioning, (_, o) => _ - .SetVersion(o.Versioning.NuGetPackageVersion)) - .WhenNotNull(this as IHasChangelog, (_, o) => _ - .SetPackageReleaseNotes(o.NuGetReleaseNotes)); + .SetVersion(o.Versioning.NuGetPackageVersion)); Configure PackSettings => _ => _; } diff --git a/src/Shims/Nuke.Components/IHazChangelog.cs b/src/Shims/Nuke.Components/IHazChangelog.cs deleted file mode 100644 index 8f053fcc9..000000000 --- a/src/Shims/Nuke.Components/IHazChangelog.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System; - -namespace Nuke.Components; - -[Obsolete("Renamed to IHasChangelog. The IHaz* names were legacy NUKE conventions; renamed for clarity in Fallout v11. This alias is shipped only in the Nuke.Components transition shim and will be removed in v12.")] -public interface IHazChangelog : IHasChangelog { } diff --git a/tests/Nuke.Components.Shim.Tests/SampleConsumerBuild.cs b/tests/Nuke.Components.Shim.Tests/SampleConsumerBuild.cs index 12a555db9..588709cf9 100644 --- a/tests/Nuke.Components.Shim.Tests/SampleConsumerBuild.cs +++ b/tests/Nuke.Components.Shim.Tests/SampleConsumerBuild.cs @@ -18,7 +18,6 @@ namespace Nuke.Components.Shim.Tests; public abstract class SampleConsumerBuildWithIHazAliases : NukeBuild, IHazArtifacts, - IHazChangelog, IHazConfiguration, IHazGitRepository, IHazGitVersion,