Skip to content

Migrate app-id to client-id and roll up dependency bumps#161

Merged
ptr727 merged 2 commits into
mainfrom
develop
Jun 8, 2026
Merged

Migrate app-id to client-id and roll up dependency bumps#161
ptr727 merged 2 commits into
mainfrom
develop

Conversation

@ptr727

@ptr727 ptr727 commented Jun 8, 2026

Copy link
Copy Markdown
Owner

Promotes develop to main.

dependabot Bot and others added 2 commits June 8, 2026 02:46
Updated [csharpier](https://github.com/belav/csharpier) from 1.2.6 to
1.3.0.

<details>
<summary>Release notes</summary>

_Sourced from [csharpier's
releases](https://github.com/belav/csharpier/releases)._

## 1.3.0

# 1.3.0
## Breaking Changes
### Change xml formatting to return error when it runs into syntax error
so it is consistent with c#
[#​1854](belav/csharpier#1854)
Previously CSharpier treated an invalid xml file as a warning instead of
an error. This was inconsistent with how it treated c# files.
Invalid c# or xml files are not treated as errors.  
The `--compilation-errors-as-warnings` argument has been renamed to
`--syntax-errors-as-warnings` and can be used to return warnings instead
of errors when encountering invalid files.

## What's Changed

### Feature: Configurable whitespace handling for xml
[#​1790](belav/csharpier#1790)
CSharpier now supports two types of xml whitespace formatting strict or
ignore.
By default all xml except `xaml` or `axaml` is treated as strict
whitespace. See
[details](https://csharpier.com/docs/Configuration#xml-whitespace-sensitivity)

### Feature: Move closing bracket for xml elements to the same line.
[#​1598](belav/csharpier#1598)
With strict xml whitespace handling, csharpier now keeps the closing
bracket for an element on the same line instead of breaking it to a new
line.
```xml
<!-- input & expected output -->
<ElementWithAttribute Attribute="AttributeValue__________________"
  >TextValue</ElementWithAttribute>

<!-- 1.2.6 -->
<ElementWithAttribute Attribute="AttributeValue__________________"
  >TextValue</ElementWithAttribute
>
```
### Feature: Support for csharpier-ignore with XML formatter
[#​1788](belav/csharpier#1788)
CSharpier now supports `csharpier-ignore` in xml files. See
[details](https://csharpier.com/docs/Ignore#xml)

### Feature: Add MSBuild transitive and multi-target support
[#​1833](belav/csharpier#1833)
CSharpier.MSBuild can now work as a transitive dependency.

### Feature: allow checking formatting with cache
[#​1830](belav/csharpier#1830)
The `csharpier check` command now supports a `--use-cache` option.

### Feature: remove dependency on Microsoft.AspNetCore.App
[#​1508](belav/csharpier#1508)
Previously CSharpier required that Microsoft.AspNetCore.App be
installed. CSharpier has been modified to use an HttpListener when it is
run using `server` to remove the need for this dependency.

### Fix: csharpier-ignore comment removes linespaces before block
[#​1867](belav/csharpier#1867)
CSharpier was removing blank lines before csharpier-ignore comments in
some cases
```c#
// input and expected output
var x = 1;
    
// csharpier-ignore
var y=1;

/// 1.2.6
var x = 1;
// csharpier-ignore
var y=1;
 ... (truncated)

Commits viewable in [compare view](belav/csharpier@1.2.6...1.3.0).
</details>

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=csharpier&package-manager=nuget&previous-version=1.2.6&new-version=1.3.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore <dependency name> major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
- `@dependabot ignore <dependency name> minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
- `@dependabot ignore <dependency name>` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore <dependency name>` will remove all of the ignore conditions of the specified dependency
- `@dependabot unignore <dependency name> <ignore condition>` will remove the ignore condition of the specified dependency and ignore conditions


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
`actions/create-github-app-token` deprecated the numeric `app-id` input
in v3.0.0, and the scheduled/codegen runs log `Input 'app-id' has been
deprecated`. This switches all four call sites to `client-id`:

- `.github/workflows/merge-bot-pull-request.yml` - 3 jobs
(merge-dependabot, merge-codegen, disable-auto-merge-on-maintainer-push)
- `.github/workflows/run-codegen-pull-request-task.yml` - 1 job
(codegen)

The `CODEGEN_APP_CLIENT_ID` secret already holds the App's Client ID (it
was already wired to these steps), so **no secrets change is required**
- this is a parameter rename only.

Ports the fix already applied upstream in the ProjectTemplate
(`ptr727/ProjectTemplate` issue #88).
Copilot AI review requested due to automatic review settings June 8, 2026 15:28

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR promotes develop to main by rolling up two already-reviewed changes: updating GitHub Actions workflows to use the non-deprecated client-id input for actions/create-github-app-token, and bumping the local csharpier dotnet tool version.

Changes:

  • Replace deprecated app-id with client-id for actions/create-github-app-token across the remaining call sites.
  • Bump csharpier dotnet tool from 1.2.6 to 1.3.0.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
.github/workflows/run-codegen-pull-request-task.yml Updates the GitHub App token step to use client-id instead of deprecated app-id.
.github/workflows/merge-bot-pull-request.yml Updates all merge-bot token generation steps to use client-id instead of deprecated app-id.
.config/dotnet-tools.json Bumps csharpier tool version to 1.3.0.

@ptr727 ptr727 merged commit d5cee10 into main Jun 8, 2026
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants