From 68465086312047b4f474b3eb47c68365b79e0d3e Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Tue, 29 Nov 2022 21:13:13 +0000
Subject: [PATCH] tools: build.bat,make-release.ps1: accommodate
 winfsp.net.nupkg

---
 tools/build.bat        |  5 ++++-
 tools/make-release.ps1 | 12 +++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/tools/build.bat b/tools/build.bat
index a653ae6f..a7b99b92 100755
--- a/tools/build.bat
+++ b/tools/build.bat
@@ -43,8 +43,11 @@ call "%~dp0vcvarsall.bat" x64
 if not X%SignedPackage%==X (
     if not exist "%~dp0..\build\VStudio\build\%Configuration%\%MyProductFileName%-*.msi" (echo previous build not found >&2 & exit /b 1)
     if not exist "%SignedPackage%" (echo signed package not found >&2 & exit /b 1)
+    set Version=
+    for %%f in (build\%Configuration%\%MyProductFileName%-*.msi) do set Version=%%~nf
+    set Version=!Version:%MyProductFileName%-=!
     del "%~dp0..\build\VStudio\build\%Configuration%\%MyProductFileName%-*.msi"
-    if exist "%~dp0..\build\VStudio\build\%Configuration%\winfsp.*.nupkg" del "%~dp0..\build\VStudio\build\%Configuration%\winfsp.*.nupkg"
+    if exist "%~dp0..\build\VStudio\build\%Configuration%\winfsp.!Version!.nupkg" del "%~dp0..\build\VStudio\build\%Configuration%\winfsp.!Version!.nupkg"
     for /R "%SignedPackage%" %%f in (*.sys) do (
         copy "%%f" "%~dp0..\build\VStudio\build\%Configuration%" >nul
     )
diff --git a/tools/make-release.ps1 b/tools/make-release.ps1
index 02991f2d..f0410200 100644
--- a/tools/make-release.ps1
+++ b/tools/make-release.ps1
@@ -161,9 +161,15 @@ function Check-Assets {
         exit 1
     }
 
+    # check winfsp.net.nupkg
+    if (!(Test-Path "$ProjectRoot\build\VStudio\build\Release\winfsp.net.*.nupkg" -ErrorAction SilentlyContinue)) {
+        Write-Stderr "error: cannot find winfsp.net.*.nupkg"
+        exit 1
+    }
+
     # check winfsp.nupkg
-    if (!(Test-Path "$ProjectRoot\build\VStudio\build\Release\winfsp*.nupkg" -ErrorAction SilentlyContinue)) {
-        Write-Stderr "error: cannot find winfsp*.nupkg"
+    if (!(Test-Path "$ProjectRoot\build\VStudio\build\Release\winfsp.*.nupkg" -ErrorAction SilentlyContinue)) {
+        Write-Stderr "error: cannot find winfsp.*.nupkg"
         exit 1
     }
 
@@ -324,7 +330,7 @@ function Make-ChocoRelease {
         Check-Assets
 
         Push-Location "$ProjectRoot\build\VStudio\build\Release"
-        choco push
+        choco push (Resolve-Path winfsp.[0-9]*.nupkg)
         if ($LastExitCode -ne 0) {
             Write-Stderr "error: cannot push to Chocolatey"
             exit 1