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
44 changes: 22 additions & 22 deletions _atom/IBuild.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ namespace Atom;
[GenerateEntryPoint]
[GenerateSolutionModel]
internal interface IBuild : IWorkflowBuildDefinition,
IGithubWorkflows,
IGitHubWorkflows,
ICheckPrForBreakingChanges,
INugetPackageUnlistHelper,
IApproveDependabotPr,
IGitVersion,
IDotnetPackHelper,
IDotnetTestHelper,
INugetHelper,
IGithubReleaseHelper,
IGitHubReleaseHelper,
IDocFxHelper,
IWaitForCopilotReview
{
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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<WorkflowDefinition> IWorkflowBuildDefinition.Workflows =>
[
Expand Down Expand Up @@ -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,
Expand All @@ -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")
{
Expand All @@ -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 =
[
Expand All @@ -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
})),
Expand All @@ -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,
})),
Expand All @@ -310,7 +310,7 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed,
],
},
],
Types = [WorkflowTypes.Github.Action],
Types = [WorkflowTypes.GitHub.Action],
},
new("Dependabot Enable auto-merge")
{
Expand All @@ -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")
{
Expand All @@ -348,24 +348,24 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed,
],
},
],
Types = [WorkflowTypes.Github.Action],
Types = [WorkflowTypes.GitHub.Action],
},
WorkflowPresets.Github.Dependabot(new()
WorkflowPresets.GitHub.Dependabot(new()
{
Registries = new Dictionary<string, DependabotRegistry>
{
["nuget"] = new()
{
Type = RegistryType.NugetFeed,
Url = WorkflowLabels.Github.Dependabot.NugetUrl,
Url = WorkflowLabels.GitHub.Dependabot.NugetUrl,
},
},
Updates =
[
new()
{
Directory = "/",
PackageEcosystem = WorkflowLabels.Github.Dependabot.NugetEcosystem,
PackageEcosystem = WorkflowLabels.GitHub.Dependabot.NugetEcosystem,
Registries = new DependabotRegistries.Named("nuget"),
Groups = new Dictionary<string, DependabotGroup>
{
Expand Down
6 changes: 3 additions & 3 deletions _atom/_atom.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Invex.Atom.Module.GithubWorkflows" Version="3.7.0" />
<PackageReference Include="Invex.Atom.Module.GitVersion" Version="3.7.0" />
<PackageReference Include="Invex.RepoUtils.Atom.Module" Version="1.9.0" />
<PackageReference Include="Invex.Atom.Module.GitHubWorkflows" Version="4.0.0" />
<PackageReference Include="Invex.Atom.Module.GitVersion" Version="4.0.0" />
<PackageReference Include="Invex.RepoUtils.Atom.Module" Version="2.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Invex.Process/Invex.Process.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Invex.RepoUtils.PublicApiAnalyzers" Version="1.9.0">
<PackageReference Include="Invex.RepoUtils.PublicApiAnalyzers" Version="2.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion tests/Invex.Process.Tests/Invex.Process.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="FakeItEasy" Version="9.0.1" />
<PackageReference Include="Invex.RepoUtils.TestUtils" Version="1.9.0" />
<PackageReference Include="Invex.RepoUtils.TestUtils" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.13" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.13" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.11.0" />
Expand Down
Loading