Flatten zip folders

Author: ladeak

.github/workflows/CD.yml

@@ -51,9 +51,13 @@ jobs:
         # CHttp executable (On Linux install msquic), on Windows publish without single-file, and zip the output.
         sudo apt-get install -y zip
         dotnet publish src/CHttp/CHttp.csproj --configuration ${{ env.CONFIGURATION }} --self-contained --runtime win-x64 -p:Version=${VERSION} --framework ${{ env.GH_PACKAGE_VERSION }}
-        zip -r src/CHttp/bin/Release/${{ env.GH_PACKAGE_VERSION }}/win-x64/publish/chttp-win-x64.zip src/CHttp/bin/Release/${{ env.GH_PACKAGE_VERSION }}/win-x64/publish/
+        pushd src/CHttp/bin/Release/${{ env.GH_PACKAGE_VERSION }}/win-x64/publish/
+        zip -r chttp-win-x64.zip .
+        popd
         dotnet publish src/CHttp/CHttp.csproj --configuration ${{ env.CONFIGURATION }} --self-contained --runtime win-arm64 -p:Version=${VERSION} --framework ${{ env.GH_PACKAGE_VERSION }}
-        zip -r src/CHttp/bin/Release/${{ env.GH_PACKAGE_VERSION }}/win-arm64/publish/chttp-win-arm64.zip src/CHttp/bin/Release/${{ env.GH_PACKAGE_VERSION }}/win-arm64/publish/
+        pushd src/CHttp/bin/Release/${{ env.GH_PACKAGE_VERSION }}/win-arm64/publish/
+        zip -r chttp-win-arm64.zip .
+        popd
         dotnet publish src/CHttp/CHttp.csproj --configuration ${{ env.CONFIGURATION }} --self-contained --runtime linux-x64 -p:Version=${VERSION} --framework ${{ env.GH_PACKAGE_VERSION }}
         mv src/CHttp/bin/Release/${{ env.GH_PACKAGE_VERSION }}/linux-x64/publish/CHttp src/CHttp/bin/Release/${{ env.GH_PACKAGE_VERSION }}/linux-x64/publish/chttp-linux-x64
         dotnet publish src/CHttp/CHttp.csproj --configuration ${{ env.CONFIGURATION }} --self-contained --runtime linux-arm64 -p:Version=${VERSION} -p:PublishSingleFile=true -p:PublishTrimmed=true --framework ${{ env.GH_PACKAGE_VERSION }}
@@ -65,7 +69,9 @@ jobs:
         mv src/CHttp/bin/Release/${{ env.GH_PACKAGE_VERSION }}/linux-x64/publish/CHttp src/CHttp/bin/Release/${{ env.GH_PACKAGE_VERSION }}/linux-x64/publish/chttp-linux-x64-aot
         # CHttpExecutor
         dotnet publish src/CHttpExecutor/CHttpExecutor.csproj --configuration ${{ env.CONFIGURATION }} --self-contained --runtime win-x64 -p:Version=${VERSION} --framework ${{ env.GH_PACKAGE_VERSION }}
-        zip -r src/CHttpExecutor/bin/Release/${{ env.GH_PACKAGE_VERSION }}/win-x64/publish/chttpexec-win-x64.zip src/CHttp/bin/Release/${{ env.GH_PACKAGE_VERSION }}/win-x64/publish/
+        pushd src/CHttpExecutor/bin/Release/${{ env.GH_PACKAGE_VERSION }}/win-x64/publish/
+        zip -r chttpexec-win-x64.zip .
+        popd
         dotnet publish src/CHttpExecutor/CHttpExecutor.csproj --configuration ${{ env.CONFIGURATION }} --self-contained --runtime linux-x64 -p:Version=${VERSION} --framework ${{ env.GH_PACKAGE_VERSION }}
         mv src/CHttpExecutor/bin/Release/${{ env.GH_PACKAGE_VERSION }}/linux-x64/publish/CHttpExecutor src/CHttpExecutor/bin/Release/${{ env.GH_PACKAGE_VERSION }}/linux-x64/publish/chttpexec-linux-x64
     - name: Publish to GitHub