From 1780fbe0c9567c20b8c8f942b96df27c99bc1133 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 3 Jun 2025 13:38:12 +0200
Subject: [PATCH 1/2] ci: do verify that NuGet packages can be built

While fixing a problem during the v2.50.0-rc0 cycle, I edited
`make-file-list.sh` in a way that broke `nuget/release.sh`.
Unfortunately, this was only detected at the very last step of the
release process.

Let's catch things like this a lot earlier.

Note: We do not need to bother testing `nuget/release.sh` on
Windows/ARM64 because we're only building NuGet packages for x64, see
https://github.com/git-for-windows/git-for-windows-automation/blob/7766f3c6afa8/.github/workflows/git-artifacts.yml#L175

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .github/workflows/main.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 664523e089..2a54cf5956 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,6 +36,7 @@ jobs:
               -e '/^make-file-list\.sh$/ainstaller/' \
               -e '/^make-file-list\.sh$/aportable/' \
               -e '/^make-file-list\.sh$/amingit/' \
+              -e '/^make-file-list\.sh$/anuget/' \
               -e '/^7-Zip\//aportable/' \
               -e 's|^\(installer/\).*|\1|' \
               -e 's|[^/]*$||' |
@@ -134,6 +135,10 @@ jobs:
             git-sdk: git-sdk-arm64
             mingw-prefix: clangarm64
             msystem: CLANGARM64
+        exclude:
+          - directory: nuget
+            architecture:
+              name: aarch64
     runs-on: ${{ matrix.architecture.runner }}
     steps:
       - uses: actions/checkout@v4

From 831610377b1f549e82813863fb8bf0d5e7a751ff Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 3 Jun 2025 13:39:37 +0200
Subject: [PATCH 2/2] make-file-list: unbreak `nuget/release.sh`

The file list must not contain unexpanded shell patterns. Otherwise
building the NuGet package will fail with something like this:

  Target path 'tools\etc\msystem*' contains invalid characters.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 make-file-list.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/make-file-list.sh b/make-file-list.sh
index 7838c1c2f4..8741443357 100755
--- a/make-file-list.sh
+++ b/make-file-list.sh
@@ -401,12 +401,14 @@ then
 	etc/profile
 	etc/profile.d/lang.sh
 	etc/bash.bashrc
-	etc/msystem*
+	etc/msystem
 	usr/bin/dash.exe
 	usr/bin/getopt.exe
 	EOF
 	test ! -f /etc/bash.bash_logout ||
 	echo etc/bash.bash_logout
+	test ! -d /etc/msystem.d ||
+	(cd / && find etc/msystem.d -type f)
 fi
 
 EXTRA_DLL_FILES=