diff --git a/_atom/IBuild.cs b/_atom/IBuild.cs index 9425463..3316ffe 100644 --- a/_atom/IBuild.cs +++ b/_atom/IBuild.cs @@ -9,7 +9,7 @@ namespace Atom; [GenerateEntryPoint] [GenerateSolutionModel] internal interface IBuild : IWorkflowBuildDefinition, - IGithubWorkflows, + IGitHubWorkflows, ICheckPrForBreakingChanges, INugetPackageUnlistHelper, IApproveDependabotPr, @@ -17,7 +17,7 @@ internal interface IBuild : IWorkflowBuildDefinition, IDotnetPackHelper, IDotnetTestHelper, INugetHelper, - IGithubReleaseHelper, + IGitHubReleaseHelper, IDocFxHelper, IWaitForCopilotReview { @@ -157,7 +157,7 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed, Target PushToRelease => d => d .DescribedAs("Pushes the packages to the release feed.") - .RequiresParam(nameof(GithubToken)) + .RequiresParam(nameof(GitHubToken)) .ConsumesVariable(nameof(SetupBuildInfo), nameof(BuildVersion)) .ConsumesVariable(nameof(SetupBuildInfo), nameof(BuildId)) .ConsumesArtifacts(nameof(PackProjects), ProjectsToPack) @@ -187,11 +187,11 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed, Target PublishDocs => t => t .DescribedAs("Publishes the DocFX documentation to Github Pages.") - .RequiresParam(nameof(GithubToken)) + .RequiresParam(nameof(GitHubToken)) .ConsumesArtifact(nameof(BuildDocs), GeneratedDocsArtifactName) .DependsOn(nameof(SetupBuildInfo)) .Executes(cancellationToken => - PublishDocFxDocsToGithub(GithubToken, GeneratedDocsArtifactName, cancellationToken)); + PublishDocFxDocsToGithub(GitHubToken, GeneratedDocsArtifactName, cancellationToken)); IReadOnlyList IWorkflowBuildDefinition.Workflows => [ @@ -224,8 +224,8 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed, Options = [ BuildOptions.Target.SuppressArtifactPublishing, - BuildOptions.Inject.Secret(nameof(GithubToken)), - BuildOptions.Github.TokenPermissions.Set(new Permissions.Exact(new() + BuildOptions.Inject.Secret(nameof(GitHubToken)), + BuildOptions.GitHub.TokenPermissions.Set(new Permissions.Exact(new() { IdTokens = PermissionsLevel.Write, Contents = PermissionsLevel.Write, @@ -234,19 +234,19 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed, })), BuildOptions.Inject.Github.PullRequestNumber, BuildOptions.Target.RunIfWorkflowCondition( - TextExpressions.Github.GithubEventName.EqualToString("pull_request")), + TextExpressions.GitHub.GitHubEventName.EqualToString("pull_request")), ], }, new(nameof(WaitForCopilotReview)) { Options = [ - BuildOptions.Inject.Secret(nameof(GithubToken)), + BuildOptions.Inject.Secret(nameof(GitHubToken)), BuildOptions.Inject.Github.PullRequestNumber, ], }, ], - Types = [WorkflowTypes.Github.Action], + Types = [WorkflowTypes.GitHub.Action], }, new("Build") { @@ -257,7 +257,7 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed, { IncludedBranches = ["main", "feature/**", "patch/**"], }, - new GithubTrigger(new On.Release([On.Release.ReleaseType.released])), + new GitHubTrigger(new On.Release([On.Release.ReleaseType.released])), ], Targets = [ @@ -281,8 +281,8 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed, { Options = [ - BuildOptions.Inject.Secret(nameof(GithubToken)), - new GithubTokenPermissionsOption(new Permissions.Exact(new() + BuildOptions.Inject.Secret(nameof(GitHubToken)), + new GitHubTokenPermissionsOption(new Permissions.Exact(new() { Contents = PermissionsLevel.Write })), @@ -297,8 +297,8 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed, { Options = [ - BuildOptions.Inject.Secret(nameof(GithubToken)), - new GithubTokenPermissionsOption(new Permissions.Exact(new() + BuildOptions.Inject.Secret(nameof(GitHubToken)), + new GitHubTokenPermissionsOption(new Permissions.Exact(new() { Contents = PermissionsLevel.Write, })), @@ -310,7 +310,7 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed, ], }, ], - Types = [WorkflowTypes.Github.Action], + Types = [WorkflowTypes.GitHub.Action], }, new("Dependabot Enable auto-merge") { @@ -324,11 +324,11 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed, BuildOptions.Inject.Github.PullRequestNumber, BuildOptions.Inject.Github.DependabotEnableAutoMergePat, BuildOptions.Target.RunIfWorkflowCondition( - TextExpressions.Github.GithubActor.EqualToString("dependabot[bot]")), + TextExpressions.GitHub.GitHubActor.EqualToString("dependabot[bot]")), ] } ], - Types = [WorkflowTypes.Github.Action] + Types = [WorkflowTypes.GitHub.Action] }, new("Cleanup Prereleases") { @@ -348,16 +348,16 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed, ], }, ], - Types = [WorkflowTypes.Github.Action], + Types = [WorkflowTypes.GitHub.Action], }, - WorkflowPresets.Github.Dependabot(new() + WorkflowPresets.GitHub.Dependabot(new() { Registries = new Dictionary { ["nuget"] = new() { Type = RegistryType.NugetFeed, - Url = WorkflowLabels.Github.Dependabot.NugetUrl, + Url = WorkflowLabels.GitHub.Dependabot.NugetUrl, }, }, Updates = @@ -365,7 +365,7 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed, new() { Directory = "/", - PackageEcosystem = WorkflowLabels.Github.Dependabot.NugetEcosystem, + PackageEcosystem = WorkflowLabels.GitHub.Dependabot.NugetEcosystem, Registries = new DependabotRegistries.Named("nuget"), Groups = new Dictionary { diff --git a/_atom/_atom.csproj b/_atom/_atom.csproj index e2dfe0b..123a3d8 100644 --- a/_atom/_atom.csproj +++ b/_atom/_atom.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/src/Invex.Process/Invex.Process.csproj b/src/Invex.Process/Invex.Process.csproj index 9268a0e..7ec876d 100644 --- a/src/Invex.Process/Invex.Process.csproj +++ b/src/Invex.Process/Invex.Process.csproj @@ -5,7 +5,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Invex.Process.Tests/Invex.Process.Tests.csproj b/tests/Invex.Process.Tests/Invex.Process.Tests.csproj index f4aa010..04ec77f 100644 --- a/tests/Invex.Process.Tests/Invex.Process.Tests.csproj +++ b/tests/Invex.Process.Tests/Invex.Process.Tests.csproj @@ -9,7 +9,7 @@ - +