Skip to content

Keep template_feed/../content/../.gitattributes in archives#52741

Merged
baronfel merged 1 commit intodotnet:mainfrom
omajid:fix-missing-dotnet-gitattributes-template
Feb 3, 2026
Merged

Keep template_feed/../content/../.gitattributes in archives#52741
baronfel merged 1 commit intodotnet:mainfrom
omajid:fix-missing-dotnet-gitattributes-template

Conversation

@omajid
Copy link
Member

@omajid omajid commented Jan 29, 2026

Some consumers of the VMR source build consume the git archive generated source tarball. Without this change, the source tarball doesn't include the content/../.gitattributes file, which makes dotnet new gitattributes non-functional.

Fixes: #52307

@baronfel
Copy link
Member

/backport to release/10.0.1xx

@baronfel
Copy link
Member

/backport to release/10.0.2xx

@github-actions
Copy link
Contributor

Started backporting to release/10.0.1xx (link to workflow run)

@github-actions
Copy link
Contributor

Started backporting to release/10.0.2xx (link to workflow run)

@github-actions
Copy link
Contributor

@baronfel backporting to release/10.0.1xx failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Patch format detection failed.
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

@github-actions
Copy link
Contributor

@baronfel backporting to release/10.0.2xx failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Patch format detection failed.
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

Some consumers of the VMR source build consume the `git archive`
generated source tarball. Without this change, the source tarball doesn't
include the content/../.gitattributes file, which makes `dotnet new
gitattributes` non-functional.

Fixes: dotnet#52307
@baronfel
Copy link
Member

baronfel commented Feb 2, 2026

Did the manual backports - this is good to go, I'm not sure why the build is stuck. @dsplaisted have you seen this before?

@dsplaisted
Copy link
Member

Do changes to .gitattributes not trigger the pipelines? @marcpopMSFT @MiYanni @nagilson

@baronfel baronfel added Area-Common templates Covers templates in the repo (classlib, console, common item templates) and removed Area-Infrastructure labels Feb 2, 2026
@MiYanni
Copy link
Member

MiYanni commented Feb 2, 2026

Do changes to .gitattributes not trigger the pipelines? @marcpopMSFT @MiYanni @nagilson

image

@marcpopMSFT
Copy link
Member

/ba-g no impact to the build and an issue is filed to add a test in source build.

@baronfel baronfel merged commit e004a74 into dotnet:main Feb 3, 2026
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Approved to merge Area-Common templates Covers templates in the repo (classlib, console, common item templates) Area-Linux

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[10.0.101]dotnet new gitattributes emits no file

5 participants