From 29d7ee92ee990fc20d339f1b807cc8e2ce27998e Mon Sep 17 00:00:00 2001 From: nishi_74322014 Date: Sat, 12 Sep 2026 22:15:09 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E6=BC=8F=E3=82=8C=EF=BC=88code-scanning/53?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WS_sample/ASPNETWebService/ASPNETWebService/Web.config | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/root/programs/CS/Samples/WS_sample/ASPNETWebService/ASPNETWebService/Web.config b/root/programs/CS/Samples/WS_sample/ASPNETWebService/ASPNETWebService/Web.config index 584de81b2..10a4fd5f5 100644 --- a/root/programs/CS/Samples/WS_sample/ASPNETWebService/ASPNETWebService/Web.config +++ b/root/programs/CS/Samples/WS_sample/ASPNETWebService/ASPNETWebService/Web.config @@ -333,6 +333,13 @@ + + + + + + From fdc6d1a6731b6543886f8eb285e298120cfb5e94 Mon Sep 17 00:00:00 2001 From: nishi_74322014 Date: Sat, 12 Sep 2026 22:44:30 +0900 Subject: [PATCH 2/2] fixed #590 --- root/programs/CS/10_Build_WebApp_sample.bat | 4 ++-- root/programs/CS/2_Build_NuGet_net48.bat | 4 ++-- root/programs/CS/3_Build_Business_net48.bat | 2 +- root/programs/CS/4_Build_Framework_Tool.bat | 6 +++--- root/programs/CS/5_Build_2CS_sample.bat | 8 ++++---- root/programs/CS/5_Build_Bat_sample.bat | 8 ++++---- root/programs/CS/6_Build_WSSrv_sample.bat | 4 ++-- root/programs/CS/7_Build_Framework_WS.bat | 4 ++-- root/programs/CS/8_Build_WSClnt_sample.bat | 6 +++--- root/programs/CS/y_Build_TestCode_Batch.bat | 2 +- root/programs/CS/y_Build_TestCode_DataAccess.bat | 2 +- root/programs/CS/y_Build_TestCode_Public.bat | 2 +- root/programs/CS/y_Build_TestCode_SecCUI.bat | 2 +- root/programs/CS/y_Build_TestCode_SecGUI.bat | 2 +- root/programs/CS/y_Build_TestTransmission.bat | 2 +- root/programs/CS/y_Build_TestWebAPIClient.bat | 2 +- root/programs/CS/z_Common.bat | 16 ++++++++++++++++ root/programs/VB/10_Build_WebApp_sample.bat | 4 ++-- root/programs/VB/3_Build_Business_net48.bat | 2 +- root/programs/VB/5_Build_2CS_sample.bat | 8 ++++---- root/programs/VB/5_Build_Bat_sample.bat | 8 ++++---- root/programs/VB/7_Build_Framework_WS.bat | 4 ++-- root/programs/VB/8_Build_WSClntWin_sample.bat | 2 +- root/programs/VB/9_Build_WSClntWPF_sample.bat | 2 +- root/programs/VB/z_Common.bat | 16 ++++++++++++++++ 25 files changed, 77 insertions(+), 45 deletions(-) diff --git a/root/programs/CS/10_Build_WebApp_sample.bat b/root/programs/CS/10_Build_WebApp_sample.bat index 5770bb537..7d110c151 100644 --- a/root/programs/CS/10_Build_WebApp_sample.bat +++ b/root/programs/CS/10_Build_WebApp_sample.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Batch build of WebForms_Sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\WebApp_sample\WebForms_Sample\WebForms_Sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\WebApp_sample\WebForms_Sample\WebForms_Sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\WebApp_sample\WebForms_Sample\WebForms_Sample.sln" pause @@ -26,7 +26,7 @@ pause rem -------------------------------------------------- rem Batch build of MVC_Sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\WebApp_sample\MVC_Sample\MVC_Sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\WebApp_sample\MVC_Sample\MVC_Sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\WebApp_sample\MVC_Sample\MVC_Sample.sln" pause diff --git a/root/programs/CS/2_Build_NuGet_net48.bat b/root/programs/CS/2_Build_NuGet_net48.bat index 783f351e2..72a13ea55 100644 --- a/root/programs/CS/2_Build_NuGet_net48.bat +++ b/root/programs/CS/2_Build_NuGet_net48.bat @@ -18,10 +18,10 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Build the batch Infrastructure(Nuget48) rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Infrastructure\Nuget_net48.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Infrastructure\Nuget_net48.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\Nuget_net48.sln" -..\nuget.exe restore "Frameworks\Infrastructure\Nuget_RichClient_net48.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Infrastructure\Nuget_RichClient_net48.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\Nuget_RichClient_net48.sln" pause diff --git a/root/programs/CS/3_Build_Business_net48.bat b/root/programs/CS/3_Build_Business_net48.bat index a0f86bfda..89d9a3034 100644 --- a/root/programs/CS/3_Build_Business_net48.bat +++ b/root/programs/CS/3_Build_Business_net48.bat @@ -19,7 +19,7 @@ rem -------------------------------------------------- rem Build the Infrastructures rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Infrastructure\Business_net48.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Infrastructure\Business_net48.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\Business_net48.sln" pause diff --git a/root/programs/CS/4_Build_Framework_Tool.bat b/root/programs/CS/4_Build_Framework_Tool.bat index 993686ecc..337c91480 100644 --- a/root/programs/CS/4_Build_Framework_Tool.bat +++ b/root/programs/CS/4_Build_Framework_Tool.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Batch build of DPQuery_Tool. rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Tools\DPQuery_Tool\DPQuery_Tool.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Tools\DPQuery_Tool\DPQuery_Tool.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tools\DPQuery_Tool\DPQuery_Tool.sln" pause @@ -26,7 +26,7 @@ pause rem -------------------------------------------------- rem Batch build of DaoGen_Tool. rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Tools\DaoGen_Tool\DaoGen_Tool.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Tools\DaoGen_Tool\DaoGen_Tool.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tools\DaoGen_Tool\DaoGen_Tool.sln" pause @@ -34,7 +34,7 @@ pause rem -------------------------------------------------- rem Batch build of DeployZipPackWithHTTP. rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Tools\DeployZipPackWithHTTP\DeployZipPackWithHTTP.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Tools\DeployZipPackWithHTTP\DeployZipPackWithHTTP.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tools\DeployZipPackWithHTTP\DeployZipPackWithHTTP.sln" pause diff --git a/root/programs/CS/5_Build_2CS_sample.bat b/root/programs/CS/5_Build_2CS_sample.bat index 38b66e6a9..65221fcca 100644 --- a/root/programs/CS/5_Build_2CS_sample.bat +++ b/root/programs/CS/5_Build_2CS_sample.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Batch build of 2CSClientWin_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\2CS_sample\2CSClientWin_sample\2CSClientWin_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\2CS_sample\2CSClientWin_sample\2CSClientWin_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\2CS_sample\2CSClientWin_sample\2CSClientWin_sample.sln" pause @@ -26,7 +26,7 @@ pause rem -------------------------------------------------- rem Batch build of GenDaoAndBatUpd_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\2CS_sample\GenDaoAndBatUpd_sample\GenDaoAndBatUpd_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\2CS_sample\GenDaoAndBatUpd_sample\GenDaoAndBatUpd_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\2CS_sample\GenDaoAndBatUpd_sample\GenDaoAndBatUpd_sample.sln" pause @@ -34,7 +34,7 @@ pause rem -------------------------------------------------- rem Batch build of TimeStamp_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\2CS_sample\TimeStamp_sample\TimeStamp_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\2CS_sample\TimeStamp_sample\TimeStamp_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\2CS_sample\TimeStamp_sample\TimeStamp_sample.sln" pause @@ -42,7 +42,7 @@ pause rem -------------------------------------------------- rem Batch build of 2CSClientWPF_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\\2CS_sample\2CSClientWPF_sample\2CSClientWPF_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\\2CS_sample\2CSClientWPF_sample\2CSClientWPF_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\\2CS_sample\2CSClientWPF_sample\2CSClientWPF_sample.sln" pause diff --git a/root/programs/CS/5_Build_Bat_sample.bat b/root/programs/CS/5_Build_Bat_sample.bat index 1627c678d..237127110 100644 --- a/root/programs/CS/5_Build_Bat_sample.bat +++ b/root/programs/CS/5_Build_Bat_sample.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Batch build of SimpleBatch_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\Bat_sample\SimpleBatch_sample\SimpleBatch_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\Bat_sample\SimpleBatch_sample\SimpleBatch_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\Bat_sample\SimpleBatch_sample\SimpleBatch_sample.sln" pause @@ -26,7 +26,7 @@ pause rem -------------------------------------------------- rem Batch build of RerunnableBatch_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\Bat_sample\RerunnableBatch_sample\RerunnableBatch_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\Bat_sample\RerunnableBatch_sample\RerunnableBatch_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\Bat_sample\RerunnableBatch_sample\RerunnableBatch_sample.sln" pause @@ -34,7 +34,7 @@ pause rem -------------------------------------------------- rem Batch build of RerunnableBatch_sample2. rem -------------------------------------------------- -..\nuget.exe restore "Samples\Bat_sample\RerunnableBatch_sample2\RerunnableBatch_sample2.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\Bat_sample\RerunnableBatch_sample2\RerunnableBatch_sample2.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\Bat_sample\RerunnableBatch_sample2\RerunnableBatch_sample2.sln" pause @@ -42,7 +42,7 @@ pause rem -------------------------------------------------- rem Batch build of RerunnableBatch_sample3. rem -------------------------------------------------- -..\nuget.exe restore "Samples\Bat_sample\RerunnableBatch_sample3\RerunnableBatch_sample3.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\Bat_sample\RerunnableBatch_sample3\RerunnableBatch_sample3.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\Bat_sample\RerunnableBatch_sample3\RerunnableBatch_sample3.sln" pause diff --git a/root/programs/CS/6_Build_WSSrv_sample.bat b/root/programs/CS/6_Build_WSSrv_sample.bat index e5bfbfce3..da352b85f 100644 --- a/root/programs/CS/6_Build_WSSrv_sample.bat +++ b/root/programs/CS/6_Build_WSSrv_sample.bat @@ -24,7 +24,7 @@ md "Samples\WS_sample\Build" rem -------------------------------------------------- rem Batch build of WSServer_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\WS_sample\WSServer_sample\WSServer_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\WS_sample\WSServer_sample\WSServer_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\WSServer_sample\WSServer_sample.sln" xcopy /E /Y "Samples\WS_sample\WSServer_sample\bin\%BUILD_CONFIG%" "Samples\WS_sample\Temp\%BUILD_CONFIG%\" @@ -34,7 +34,7 @@ xcopy /E /Y "Samples\WS_sample\Temp\%BUILD_CONFIG%" "Samples\WS_sample\Build\" @rem Batch build of ASPNETWebService(ResourceServer). @rem -------------------------------------------------- @rem Not copied to Build\ : nothing else references it, so just build it. -..\nuget.exe restore "Samples\WS_sample\ASPNETWebService\ASPNETWebService.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\WS_sample\ASPNETWebService\ASPNETWebService.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\ASPNETWebService\ASPNETWebService.sln" pause diff --git a/root/programs/CS/7_Build_Framework_WS.bat b/root/programs/CS/7_Build_Framework_WS.bat index 2965cce5c..e698ae186 100644 --- a/root/programs/CS/7_Build_Framework_WS.bat +++ b/root/programs/CS/7_Build_Framework_WS.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Batch build of ServiceInterface(ASPNETWebService). rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Infrastructure\ServiceInterface\ASPNETWebService\ASPNETWebService.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Infrastructure\ServiceInterface\ASPNETWebService\ASPNETWebService.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\ServiceInterface\ASPNETWebService\ASPNETWebService.sln" pause @@ -34,7 +34,7 @@ pause rem -------------------------------------------------- rem Batch build of ServiceInterface(WCFService). rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Infrastructure\ServiceInterface\WCFService\WCFService.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Infrastructure\ServiceInterface\WCFService\WCFService.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\ServiceInterface\WCFService\WCFService.sln" pause diff --git a/root/programs/CS/8_Build_WSClnt_sample.bat b/root/programs/CS/8_Build_WSClnt_sample.bat index 08c51dadd..387e702d6 100644 --- a/root/programs/CS/8_Build_WSClnt_sample.bat +++ b/root/programs/CS/8_Build_WSClnt_sample.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Batch build of WSClientWin_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\WS_sample\WSClient_sample\WSClientWin_sample\WSClientWin_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\WS_sample\WSClient_sample\WSClientWin_sample\WSClientWin_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\WSClient_sample\WSClientWin_sample\WSClientWin_sample.sln" pause @@ -26,7 +26,7 @@ pause rem -------------------------------------------------- rem Batch build of WSClientWPF_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\WS_sample\WSClient_sample\WSClientWPF_sample\WSClientWPF_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\WS_sample\WSClient_sample\WSClientWPF_sample\WSClientWPF_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\WSClient_sample\WSClientWPF_sample\WSClientWPF_sample.sln" pause @@ -41,7 +41,7 @@ pause rem -------------------------------------------------- rem Batch build of WSClientWinCone_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\WS_sample\WSClient_sample\WSClientWinCone_sample\WSClientWinCone_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\WS_sample\WSClient_sample\WSClientWinCone_sample\WSClientWinCone_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\WSClient_sample\WSClientWinCone_sample\WSClientWinCone_sample.sln" pause diff --git a/root/programs/CS/y_Build_TestCode_Batch.bat b/root/programs/CS/y_Build_TestCode_Batch.bat index fe56ef025..3d4c911d6 100644 --- a/root/programs/CS/y_Build_TestCode_Batch.bat +++ b/root/programs/CS/y_Build_TestCode_Batch.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat @rem -------------------------------------------------- @rem Batch build of SimpleBatch. @rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Tests\TestBatch\SimpleBatch\SimpleBatch.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Tests\TestBatch\SimpleBatch\SimpleBatch.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tests\TestBatch\SimpleBatch\SimpleBatch.sln" dotnet restore "Frameworks\Tests\TestBatch\SimpleBatchCore\SimpleBatchCore.sln" diff --git a/root/programs/CS/y_Build_TestCode_DataAccess.bat b/root/programs/CS/y_Build_TestCode_DataAccess.bat index 0e7aca7d5..938ddc3bb 100644 --- a/root/programs/CS/y_Build_TestCode_DataAccess.bat +++ b/root/programs/CS/y_Build_TestCode_DataAccess.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat @rem -------------------------------------------------- @rem Batch build of TestDataAccess. @rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Tests\TestDataAccess\TestDataAccessFx48.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Tests\TestDataAccess\TestDataAccessFx48.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tests\TestDataAccess\TestDataAccessFx48.sln" dotnet restore "Frameworks\Tests\TestDataAccess\TestDataAccessCore100.sln" diff --git a/root/programs/CS/y_Build_TestCode_Public.bat b/root/programs/CS/y_Build_TestCode_Public.bat index 799bab923..04468e413 100644 --- a/root/programs/CS/y_Build_TestCode_Public.bat +++ b/root/programs/CS/y_Build_TestCode_Public.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat @rem -------------------------------------------------- @rem Batch build of TestCode. @rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Tests\TestCode\TestCodeFx48.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Tests\TestCode\TestCodeFx48.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tests\TestCode\TestCodeFx48.sln" dotnet restore "Frameworks\Tests\TestCode\TestCodeCore100.sln" diff --git a/root/programs/CS/y_Build_TestCode_SecCUI.bat b/root/programs/CS/y_Build_TestCode_SecCUI.bat index 3b237e051..c2ea9b606 100644 --- a/root/programs/CS/y_Build_TestCode_SecCUI.bat +++ b/root/programs/CS/y_Build_TestCode_SecCUI.bat @@ -23,7 +23,7 @@ cd "Frameworks\Tests\EncAndDecUtilCUI" call copy_cert.bat cd %CURRENTDIR% -..\nuget.exe restore "Frameworks\Tests\EncAndDecUtilCUI\EncAndDecUtilCUIFx48.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Tests\EncAndDecUtilCUI\EncAndDecUtilCUIFx48.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tests\EncAndDecUtilCUI\EncAndDecUtilCUIFx48.sln" dotnet restore "Frameworks\Tests\EncAndDecUtilCUI\EncAndDecUtilCUICore100.sln" diff --git a/root/programs/CS/y_Build_TestCode_SecGUI.bat b/root/programs/CS/y_Build_TestCode_SecGUI.bat index 55eb45e16..592122cc0 100644 --- a/root/programs/CS/y_Build_TestCode_SecGUI.bat +++ b/root/programs/CS/y_Build_TestCode_SecGUI.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Batch build of EncAndDecUtil. rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Tests\EncAndDecUtil\EncAndDecUtil48.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Tests\EncAndDecUtil\EncAndDecUtil48.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tests\EncAndDecUtil\EncAndDecUtil48.sln" pause diff --git a/root/programs/CS/y_Build_TestTransmission.bat b/root/programs/CS/y_Build_TestTransmission.bat index 29fced846..0841a09a2 100644 --- a/root/programs/CS/y_Build_TestTransmission.bat +++ b/root/programs/CS/y_Build_TestTransmission.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat @rem -------------------------------------------------- @rem Batch build of TestTransmission. @rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Tests\TestTransmission\TestTransmissionFx48.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Tests\TestTransmission\TestTransmissionFx48.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tests\TestTransmission\TestTransmissionFx48.sln" pause diff --git a/root/programs/CS/y_Build_TestWebAPIClient.bat b/root/programs/CS/y_Build_TestWebAPIClient.bat index e18580d00..e0d8dfc6e 100644 --- a/root/programs/CS/y_Build_TestWebAPIClient.bat +++ b/root/programs/CS/y_Build_TestWebAPIClient.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat @rem -------------------------------------------------- @rem Batch build of TestTransmission. @rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Tests\TestWebAPIClient\TestWebAPIClientFx48.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Tests\TestWebAPIClient\TestWebAPIClientFx48.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tests\TestWebAPIClient\TestWebAPIClientFx48.sln" pause diff --git a/root/programs/CS/z_Common.bat b/root/programs/CS/z_Common.bat index 3ec2290c2..1c44c4932 100644 --- a/root/programs/CS/z_Common.bat +++ b/root/programs/CS/z_Common.bat @@ -121,6 +121,22 @@ set NUGET_MSBUILD=-MSBuildPath "%MSBUILDDIR%" echo NUGET_MSBUILD %NUGET_MSBUILD% +@rem -------------------------------------------------- +@rem Check that nuget.exe is present (#590). +@rem +@rem The build batches call "%~dp0..\nuget.exe" restore without looking at +@rem the exit code. When the file is missing, cmd.exe sets ERRORLEVEL 9009 +@rem and carries on, so the build fails later inside MSBuild with a message +@rem about missing NuGet packages - far from the real cause. +@rem +@rem This is a warning, not an error. A working tree that already has +@rem packages\ still builds, so stopping here would be too strict. +@rem -------------------------------------------------- +if not exist "%~dp0..\nuget.exe" ( + echo [WARNING] nuget.exe was not found. packages.config is not restored. + echo Restore nuget.exe at root\programs - it is version controlled. +) + @echo -------------------------------------------------- @echo The choice of build configuration (Debug / Release). @echo BUILD_CONFIG names the configuration (Debug or Release). diff --git a/root/programs/VB/10_Build_WebApp_sample.bat b/root/programs/VB/10_Build_WebApp_sample.bat index 3491239d9..8aa3b6765 100644 --- a/root/programs/VB/10_Build_WebApp_sample.bat +++ b/root/programs/VB/10_Build_WebApp_sample.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Batch build of WebForms_Sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\WebApp_sample\WebForms_Sample\WebForms_Sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\WebApp_sample\WebForms_Sample\WebForms_Sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\WebApp_sample\WebForms_Sample\WebForms_Sample.sln" pause @@ -26,7 +26,7 @@ pause rem -------------------------------------------------- rem Batch build of MVC_Sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\WebApp_sample\MVC_Sample\MVC_Sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\WebApp_sample\MVC_Sample\MVC_Sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\WebApp_sample\MVC_Sample\MVC_Sample.sln" pause diff --git a/root/programs/VB/3_Build_Business_net48.bat b/root/programs/VB/3_Build_Business_net48.bat index b22584bff..abe8945e0 100644 --- a/root/programs/VB/3_Build_Business_net48.bat +++ b/root/programs/VB/3_Build_Business_net48.bat @@ -19,7 +19,7 @@ rem -------------------------------------------------- rem Build the Infrastructures rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Infrastructure\Business_net48.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Infrastructure\Business_net48.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\Business_net48.sln" pause diff --git a/root/programs/VB/5_Build_2CS_sample.bat b/root/programs/VB/5_Build_2CS_sample.bat index e6f3729ec..cd6e194fb 100644 --- a/root/programs/VB/5_Build_2CS_sample.bat +++ b/root/programs/VB/5_Build_2CS_sample.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Batch build of 2CSClientWin_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\2CS_sample\2CSClientWin_sample\2CSClientWin_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\2CS_sample\2CSClientWin_sample\2CSClientWin_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\2CS_sample\2CSClientWin_sample\2CSClientWin_sample.sln" pause @@ -26,7 +26,7 @@ pause rem -------------------------------------------------- rem Batch build of GenDaoAndBatUpd_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\2CS_sample\GenDaoAndBatUpd_sample\GenDaoAndBatUpd_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\2CS_sample\GenDaoAndBatUpd_sample\GenDaoAndBatUpd_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\2CS_sample\GenDaoAndBatUpd_sample\GenDaoAndBatUpd_sample.sln" pause @@ -34,7 +34,7 @@ pause rem -------------------------------------------------- rem Batch build of TimeStamp_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\2CS_sample\TimeStamp_sample\TimeStamp_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\2CS_sample\TimeStamp_sample\TimeStamp_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\2CS_sample\TimeStamp_sample\TimeStamp_sample.sln" pause @@ -42,7 +42,7 @@ pause rem -------------------------------------------------- rem Batch build of 2CSClientWPF_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\\2CS_sample\2CSClientWPF_sample\2CSClientWPF_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\\2CS_sample\2CSClientWPF_sample\2CSClientWPF_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\\2CS_sample\2CSClientWPF_sample\2CSClientWPF_sample.sln" pause diff --git a/root/programs/VB/5_Build_Bat_sample.bat b/root/programs/VB/5_Build_Bat_sample.bat index 1627c678d..237127110 100644 --- a/root/programs/VB/5_Build_Bat_sample.bat +++ b/root/programs/VB/5_Build_Bat_sample.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Batch build of SimpleBatch_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\Bat_sample\SimpleBatch_sample\SimpleBatch_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\Bat_sample\SimpleBatch_sample\SimpleBatch_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\Bat_sample\SimpleBatch_sample\SimpleBatch_sample.sln" pause @@ -26,7 +26,7 @@ pause rem -------------------------------------------------- rem Batch build of RerunnableBatch_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\Bat_sample\RerunnableBatch_sample\RerunnableBatch_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\Bat_sample\RerunnableBatch_sample\RerunnableBatch_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\Bat_sample\RerunnableBatch_sample\RerunnableBatch_sample.sln" pause @@ -34,7 +34,7 @@ pause rem -------------------------------------------------- rem Batch build of RerunnableBatch_sample2. rem -------------------------------------------------- -..\nuget.exe restore "Samples\Bat_sample\RerunnableBatch_sample2\RerunnableBatch_sample2.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\Bat_sample\RerunnableBatch_sample2\RerunnableBatch_sample2.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\Bat_sample\RerunnableBatch_sample2\RerunnableBatch_sample2.sln" pause @@ -42,7 +42,7 @@ pause rem -------------------------------------------------- rem Batch build of RerunnableBatch_sample3. rem -------------------------------------------------- -..\nuget.exe restore "Samples\Bat_sample\RerunnableBatch_sample3\RerunnableBatch_sample3.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\Bat_sample\RerunnableBatch_sample3\RerunnableBatch_sample3.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\Bat_sample\RerunnableBatch_sample3\RerunnableBatch_sample3.sln" pause diff --git a/root/programs/VB/7_Build_Framework_WS.bat b/root/programs/VB/7_Build_Framework_WS.bat index 349f072cf..94c843bed 100644 --- a/root/programs/VB/7_Build_Framework_WS.bat +++ b/root/programs/VB/7_Build_Framework_WS.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Batch build of ServiceInterface(ASPNETWebService). rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Infrastructure\ServiceInterface\ASPNETWebService\ASPNETWebService.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Infrastructure\ServiceInterface\ASPNETWebService\ASPNETWebService.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\ServiceInterface\ASPNETWebService\ASPNETWebService.sln" pause @@ -34,7 +34,7 @@ pause rem -------------------------------------------------- rem Batch build of ServiceInterface(WCFService). rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Infrastructure\ServiceInterface\WCFService\WCFService.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Frameworks\Infrastructure\ServiceInterface\WCFService\WCFService.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\ServiceInterface\WCFService\WCFService.sln" pause diff --git a/root/programs/VB/8_Build_WSClntWin_sample.bat b/root/programs/VB/8_Build_WSClntWin_sample.bat index 86b450e38..6dad7347f 100644 --- a/root/programs/VB/8_Build_WSClntWin_sample.bat +++ b/root/programs/VB/8_Build_WSClntWin_sample.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Batch build of WSClientWin_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\WS_sample\WSClient_sample\WSClientWin_sample\WSClientWin_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\WS_sample\WSClient_sample\WSClientWin_sample\WSClientWin_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\WSClient_sample\WSClientWin_sample\WSClientWin_sample.sln" pause diff --git a/root/programs/VB/9_Build_WSClntWPF_sample.bat b/root/programs/VB/9_Build_WSClntWPF_sample.bat index 2fb9bf22a..3dab37e10 100644 --- a/root/programs/VB/9_Build_WSClntWPF_sample.bat +++ b/root/programs/VB/9_Build_WSClntWPF_sample.bat @@ -18,7 +18,7 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Batch build of WSClientWPF_sample. rem -------------------------------------------------- -..\nuget.exe restore "Samples\WS_sample\WSClient_sample\WSClientWPF_sample\WSClientWPF_sample.sln" %NUGET_MSBUILD% +"%~dp0..\nuget.exe" restore "Samples\WS_sample\WSClient_sample\WSClientWPF_sample\WSClientWPF_sample.sln" %NUGET_MSBUILD% %BUILDFILEPATH% %COMMANDLINE% "Samples\WS_sample\WSClient_sample\WSClientWPF_sample\WSClientWPF_sample.sln" pause diff --git a/root/programs/VB/z_Common.bat b/root/programs/VB/z_Common.bat index a3aa0f1af..5b48b07f6 100644 --- a/root/programs/VB/z_Common.bat +++ b/root/programs/VB/z_Common.bat @@ -118,6 +118,22 @@ set NUGET_MSBUILD=-MSBuildPath "%MSBUILDDIR%" echo NUGET_MSBUILD %NUGET_MSBUILD% +@rem -------------------------------------------------- +@rem Check that nuget.exe is present (#590). +@rem +@rem The build batches call "%~dp0..\nuget.exe" restore without looking at +@rem the exit code. When the file is missing, cmd.exe sets ERRORLEVEL 9009 +@rem and carries on, so the build fails later inside MSBuild with a message +@rem about missing NuGet packages - far from the real cause. +@rem +@rem This is a warning, not an error. A working tree that already has +@rem packages\ still builds, so stopping here would be too strict. +@rem -------------------------------------------------- +if not exist "%~dp0..\nuget.exe" ( + echo [WARNING] nuget.exe was not found. packages.config is not restored. + echo Restore nuget.exe at root\programs - it is version controlled. +) + @echo -------------------------------------------------- @echo The choice of build configuration (Debug / Release). @echo BUILD_CONFIG names the configuration (Debug or Release).